5 years agoqdoc: Don't load index in -prepare phase
Martin Smith [Thu, 25 Oct 2012 10:44:16 +0000 (12:44 +0200)]
qdoc: Don't load index in -prepare phase

qdoc was loading index files during the -prepare
phase, which it shouldn't do. The index files it
was loading were from modules other than the one
qdoc was running on. They had not been deleted
because qdoc only clears the output directory of
the module it is running on.

Also added a static function to the Location class
to print information messages on standard error.
This is useful to see what qdoc is doing and when
it is doing it because these log messages are
interleaved in the qdoc error messages. More of
these log messages will be added as needed.

Also removed some unneeded qDebug() stuff in
the code that processes the dependencies from
the qdocconf file.

Task number: QTBUG-27707

Change-Id: I1eec8d6ec89ff040969c2a1f62f21f551f347e05
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoAdd config option to build documentation as a two-step process
Tor Arne Vestbø [Mon, 22 Oct 2012 10:17:19 +0000 (12:17 +0200)]
Add config option to build documentation as a two-step process

The new 'prepare_docs' CONFIG option triggers the documentation rules in
default_post to generate two extra targets: prepare_docs and generate_docs.
The prepare_docs stage runs qdoc with the -prepare option, which means qdoc
will only generate index files, and the generate_docs stage will call
qdoc with -generate, which reads the index files and generates the final
output. The regular docs target will then run the prepare_docs target
for all submodules before running the generate_docs target.

This ensures that when generating the final output, qdoc has all the
index files for all the other modules available, to be able to resolve
cross-references between the various Qt modules.

This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so
that the root Qt5 build will be able to hook into this new behavior.

Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoMove validators example from qtdoc repo to qtbase repo
Jan Arve Saether [Wed, 24 Oct 2012 08:35:38 +0000 (10:35 +0200)]
Move validators example from qtdoc repo to qtbase repo

old path in qtdoc repo:

Change-Id: Ibf6cad9e7525fff3360cd0b99ce0911b864dea1d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoUse \annotatedlist for list of examples instead of "manual links"
Jan Arve Saether [Mon, 22 Oct 2012 11:39:07 +0000 (13:39 +0200)]
Use \annotatedlist for list of examples instead of "manual links"

Change-Id: Id945fd35f5eb6a6d11156d4a1356f99cc49405e2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoqdoc: Clear outputdir in -prepare phase only
Martin Smith [Tue, 23 Oct 2012 13:11:06 +0000 (15:11 +0200)]
qdoc: Clear outputdir in -prepare phase only

qdoc now clears the outputdir in the -prepare
phase but not in the -generate phase. It also
does not print error and warning messages in
the -prepare phase. It does print fatal errors
in the -prepare phase, of course, and the QML
parser prints syntax errors in the -prepare
phase, but all the qdoc errors and warnings
are only printed in the -generate phase.

Task number: QTBUG-27688

Change-Id: I9973a473260b4f79428f6b8e12a5ac35f3be15b4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoDoc: Added landing-, examples- and C++ class list-page to qtwidgets
Jan Arve Saether [Mon, 15 Oct 2012 13:40:28 +0000 (15:40 +0200)]
Doc: Added landing-, examples- and C++ class list-page to qtwidgets

It seems this is the pattern to follow:
landing page:    qtwidgets-index.html
examples page:   qtwidgets-examples.html
class list page: qtwidgets-module.html

Change-Id: I3e5459fe650178e0398cb43181b594c0f12a170e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoMerge remote-tracking branch 'gerrit/master' into newdocs
Tor Arne Vestbø [Fri, 19 Oct 2012 07:53:42 +0000 (09:53 +0200)]
Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07

5 years agoQStyleSheetStyle: QObject-based style & render rules
J-P Nurmi [Thu, 18 Oct 2012 13:55:45 +0000 (15:55 +0200)]
QStyleSheetStyle: QObject-based style & render rules

The goal is to cut as many QWidget dependencies as possible and make
stylesheets eventually work for the desktop components.

Change-Id: Ib4aa47af07379fc39fd6df1961e113d03df6df35
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoMake QContiguousCache with zero capacity not crash
Thiago Macieira [Tue, 25 Sep 2012 14:30:48 +0000 (16:30 +0200)]
Make QContiguousCache with zero capacity not crash

These containers don't make sense and will just result in no action
being taken (all items added will simply be discarded), but it
shouldn't crash due to a division by zero.

Update the documentation to explain the fact.

Task-number: QTBUG-27339
Change-Id: Ib9acf5c0a9a826e6853e7beaf5e56511fde98dc6
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Ian Walters <ian@walters.id.au>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix for slowness of touch move events
Bernd Weimer [Wed, 17 Oct 2012 09:19:34 +0000 (11:19 +0200)]
Fix for slowness of touch move events

In the event dispatcher native events will be processed in a tight loop
to drain the queue. IO events and timers will be postponed.

Change-Id: Ic2c06ed182027289eb5e7042fbae99efbd01ea27
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
5 years agoReview of documentation.
Michele Caini [Fri, 5 Oct 2012 16:36:03 +0000 (18:36 +0200)]
Review of documentation.

Documentation has been updated to reflect changes in Qt5.

Change-Id: I378858cf61f4bf62375c30c3903818d754dadcf0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoMake sure functions returning iterators have an iterator as parameter
Thiago Macieira [Fri, 28 Sep 2012 12:02:29 +0000 (14:02 +0200)]
Make sure functions returning iterators have an iterator as parameter

The IA-64 C++ ABI does not encode the return type for non-template
functions (QVector is the template, not the function), which means that
these two functions have the same signature:

  Node *QVector<Node>::begin()
  typename class QTypedArrayData<Node>::iterator QVector<Node>::begin()
  [both are _ZN7QVectorI4NodeE5beginEv]

When linking compilation units compiled with different
QT_STRICT_ITERATORS settings, only one of the two out-of-line copies
will survive. Depending on the ABI, we may have a problem: the ABI can
say that a function returning a structure takes an implicit first
parameter, which a function returning a regular pointer doesn't.

Task-number: QTBUG-27277
Change-Id: I57a59e5a7c46f55faabfe85c073dca89d2a7bbf3
Reviewed-by: Jan Kundrát <jkt@flaska.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoTest: remove QSKIP from tst_QDateTime::fromString_LOCALE_ILDATE
Caroline Chao [Thu, 18 Oct 2012 13:01:39 +0000 (15:01 +0200)]
Test: remove QSKIP from tst_QDateTime::fromString_LOCALE_ILDATE

Instead omit the whole test when Q_OS_WIN is not defined.

Change-Id: I311538ce839353d4d5e83edfd12c68968fe61215
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoAccessibility: itemviews check for valid model.
Frederik Gladhorn [Fri, 28 Sep 2012 17:43:52 +0000 (19:43 +0200)]
Accessibility: itemviews check for valid model.

The problem is that isValid() should return true as
soon as we have a view widget.
That sadly means we need to verify that the model is still
valid whenever accessing it.

Change-Id: I9237528abf2f5c75a73382525103307e9ca15f05
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoCMake: Remove content from else() and endif() commands.
Stephen Kelly [Wed, 17 Oct 2012 14:00:50 +0000 (16:00 +0200)]
CMake: Remove content from else() and endif() commands.

Having them empty is the common style and is less noisy.

Change-Id: I30c0c4d297a7bdb373a57a636f4fdbc488a69fcd
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
5 years agoChange the default major version of QGLFormat to 2.
Jason Barron [Tue, 16 Oct 2012 12:58:47 +0000 (14:58 +0200)]
Change the default major version of QGLFormat to 2.

This is being changed because:
- The OpenGL paint engine in Qt only supports GL2
- QML2 only supports GL2
- QSurfaceFormat has a default value of 2

Applications that want to use GL1 on a QGLWidget will have to
explicitly request this format using QGLFormat::setVersion.

Task-number: QTBUG-27589

Change-Id: Ieb283ef7d6e15a29ec28ce7e4363dbf477decaa7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agotst_qlocalsocket: get rid of QtScript dependency
Joerg Bornemann [Tue, 16 Oct 2012 08:34:44 +0000 (10:34 +0200)]
tst_qlocalsocket: get rid of QtScript dependency

Removing the lackey executable that needs QtScript to be built.
This was a qscript bastard that was able to run a client and a server
script. It's replaced by a C++ version with the same functionality.

Nice side effect: the two second wait per test row could be removed.
The client executable is now waiting for the server to be created.

Task-number: QTBUG-24142

Change-Id: I135b75abf6620d3b0af50dc226ea8c81c2bf4149
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoMake QtDBus work again with D-Bus 1.0 and 1.1
Thiago Macieira [Thu, 18 Oct 2012 23:27:35 +0000 (16:27 -0700)]
Make QtDBus work again with D-Bus 1.0 and 1.1

The dbus_get_version function was introduced in 1.2, so we'd need to
detect pre-1.2 by the absence of the function. But if we're going to
detect the presence or absence of any function, we might as well do it
on dbus_connection_can_send_type, which is the function we wanted anyway.

Change-Id: I6e17a3a8f1382c6a489490084f6e3f61aa5a1947
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
5 years agotest: Moving tst_QProcess::echoTest_performance()
Sergio Ahumada [Tue, 16 Oct 2012 21:08:35 +0000 (23:08 +0200)]
test: Moving tst_QProcess::echoTest_performance()

tst_QProcess::echoTest_performance() is not an unit test but a
performance test, so moving it from 'tests/auto/corelib/io/qprocess'
to 'tests/benchmarks/corelib/io/qprocess'

Change-Id: I796788534eafc5ca3b8d86c0ec46998285fd4b8f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFixed inconsistent QPainter fill rules for aliased painting.
Samuel Rødal [Wed, 10 Oct 2012 10:38:07 +0000 (12:38 +0200)]
Fixed inconsistent QPainter fill rules for aliased painting.

Qt 5 is the time to get rid of all the old inconsistencies in the raster
paint engine caused by trying to preserve the old X11 based
coordinate system where (0, 0) is in the center of the top-left pixel
instead of the upper left corner of said pixel. However, this was only
adhered for line drawing and path / rect filling, and not for image or
pixmap drawing and not at all when doing antialiased painting. By
defining the antialiased coordinate system as being the right one and
letting the aliased fill rules follow from that we finally end up with
some consistent behavior that doesn't lead to surprises and workarounds
in application code.

It is still possible for applications to get the old behavior by
setting the QPainter::Qt4CompatiblePainting render hint. This should
make porting easier for the few cases where an application relies on the
aliased fill rules we used to have in Qt 4.

Task-number: QTBUG-27500
Change-Id: If86b95e77d838ec83033d64af86632b9a73c74a9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoHandle the case where persistent indexes have gone invalid.
Stephen Kelly [Wed, 17 Oct 2012 07:20:10 +0000 (09:20 +0200)]
Handle the case where persistent indexes have gone invalid.

Don't add invalid ranges to the result. They will be removed
whenever d->ranges is processed for public consumption
anyway. For example, QItemSelectionModel::selection() calls
merge() with another selection. The merge() method removes
invalid ranges already. But the invalid ranges don't need
to be there in the first place, so this patch removes them.

A longer-term goal is to maintain d->ranges as an always-sorted list.

This method can be called with a vector containing invalid
QPersistentModelIndexes when those persistent indexes are made invalid
in between layoutAboutToBeChanged and layoutChanged. It's a normal
thing to happen and a case that should be handled deliberately.

Change-Id: I741ed9208d8a75644975c9e8d61f0d6d78e20576
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoMake sure uints remain uints when editing in itemviews.
Stephen Kelly [Tue, 2 Oct 2012 11:01:30 +0000 (13:01 +0200)]
Make sure uints remain uints when editing in itemviews.

Task-number: QTBUG-22974
Change-Id: I07428862c4dffc629f868f3010f663eb655922d0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoCorrect accessibility index handling in QListView
José Millán Soto [Sat, 22 Sep 2012 21:19:44 +0000 (23:19 +0200)]
Correct accessibility index handling in QListView

QListView::currentChanged and QListView::selectionChanged changed to
use 0-based indexes instead of 1-based indexes.

Change-Id: Ie618970c9a37ec76156dbfab2e86685c3c8f374c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoHandle separators in menus in AT-SPI (Linux accessibility)
José Millán Soto [Wed, 12 Sep 2012 17:09:55 +0000 (19:09 +0200)]
Handle separators in menus in AT-SPI (Linux accessibility)

Change-Id: Id9c109d53bbb8ded04bbe98a622d44e13d572340
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agonormalise signal/slot signatures [QtNetwork tests]
Marc Mutz [Tue, 16 Oct 2012 09:10:22 +0000 (11:10 +0200)]
normalise signal/slot signatures [QtNetwork tests]

Change-Id: I2491cfe421a811d00759224da03580b3dcc2a091
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agonormalise signal/slot signatures [QtDBus tests]
Marc Mutz [Tue, 16 Oct 2012 09:09:03 +0000 (11:09 +0200)]
normalise signal/slot signatures [QtDBus tests]

Change-Id: I4a0441d37e455dce28072ee3650b2062bec65759
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agonormalise signal/slot signatures [QtWidgets tests]
Marc Mutz [Tue, 16 Oct 2012 09:08:13 +0000 (11:08 +0200)]
normalise signal/slot signatures [QtWidgets tests]

Change-Id: Iffab60f0911a55e4be09faeb29df0bae1ea2eb19
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDoc fix in return value of QDate::setYMD
Frederik Gladhorn [Tue, 16 Oct 2012 10:57:31 +0000 (12:57 +0200)]
Doc fix in return value of QDate::setYMD

Change-Id: Ie107e451a7b2a084fb6131939f212acd412a9df6
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoClean up instantiation of mapping of AT-SPI roles.
Frederik Gladhorn [Thu, 18 Oct 2012 16:07:54 +0000 (18:07 +0200)]
Clean up instantiation of mapping of AT-SPI roles.

Change-Id: If31b33f1b259f896408a66b0574d640b0ad57019
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoAccessibility: make sure right objects are cached on linux
Frederik Gladhorn [Thu, 18 Oct 2012 17:31:59 +0000 (19:31 +0200)]
Accessibility: make sure right objects are cached on linux

The linux test would actually fail because the qobjects created
could end up having the same address (create-delete-create...).
After an object is deleted, it's not instantly removed from the
cache of valid objects.
Instead it would stay in the list with it's smart pointer becoming zero.

This patch adds the missing null pointer check so we are always up to date.

Change-Id: Ia7be14741d4798c2b8e75cb7127298c73cf206ef
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoCocoa: fix memory leak
Teemu Katajisto [Wed, 17 Oct 2012 12:42:06 +0000 (15:42 +0300)]
Cocoa: fix memory leak

Release the created CGImageRef.

Change-Id: If3b36b636ae1302b8a63bbae7285a6461b993f62
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoCocoa: fix coretext memory leaks
Teemu Katajisto [Thu, 18 Oct 2012 08:02:33 +0000 (11:02 +0300)]
Cocoa: fix coretext memory leaks

Change-Id: Id85dbf8a2ea8994d9fca07d3f10b43f62ec305a0
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoRename the syncqt -qtdir to -mkspecsdir
Thiago Macieira [Mon, 15 Oct 2012 20:30:49 +0000 (13:30 -0700)]
Rename the syncqt -qtdir to -mkspecsdir

It's actually looking for the mkspecs (so it can read qconfig.pri to
get the Qt version), so give it exactly what it wants.

Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQNX: Change base font sizes from pixels to points
Kevin Krammer [Thu, 18 Oct 2012 09:36:48 +0000 (11:36 +0200)]
QNX: Change base font sizes from pixels to points

Previously recommended fonts sizes in pixels do not work very well
on the new high resolution devices.

Current UX documentation recommends certain point sizes for certain
roles. Those work well on both type of devices.

Change-Id: Ia4faa4cf2d753cab9b10f91d01dfef1450683272
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoCocoa: fix frameStrutMouseEvents
Richard Moe Gustavsen [Thu, 18 Oct 2012 11:25:56 +0000 (13:25 +0200)]
Cocoa: fix frameStrutMouseEvents

It turns out that the calculation of mouse pos over the frame
strut (title bar) was wrong. When outside the content view, the
nsevent coordinates are negative, so to get this correct, we
need to calculate the height of the window above the content view
and use this information to get the mouse pos in positive
coordinates with origin window top left.

This bug was especially apperent with QDockWidget, as it became
almost impossible to dock a window under such circumstances.

Change-Id: I2faf6aab5e2aa0b4e217ea087ceec8c1b1e978bb
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoIntroduce new style Fusion
Jens Bache-Wiig [Fri, 21 Sep 2012 17:53:28 +0000 (19:53 +0200)]
Introduce new style Fusion

This is a new non-native style for Qt.
It is intended as a replacement for the now aging
Plastique and Cleanlooks styles.

Change-Id: I30c0518a69e4e3b8b2b05ee7d84c3a5a1f307578
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoModified vertical alignments of simple widgets on OSX
Tero Ahola [Tue, 7 Aug 2012 12:10:47 +0000 (15:10 +0300)]
Modified vertical alignments of simple widgets on OSX

Adding QCheckBox, QComboBox, QLineEdit etc. into an HBox layout or grid
layout makes the layout look like a snake's trail. Fixed the positioning
of these widgets to make the layouts visually more appealing.

Updated qmacstyle auto-test accordingly.

Task-number: QTBUG-13635
Ammended-by: Gabriel de Dietrich
Change-Id: I89461f9aad68ea8488070ed06257b9b8e7f493c5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
5 years agoPrevent 'make install' from automatically installing documentation
Tor Arne Vestbø [Wed, 17 Oct 2012 13:08:39 +0000 (15:08 +0200)]
Prevent 'make install' from automatically installing documentation

Just like 'make docs' is used to build documentation, you will now have
to run 'make install_docs' to install it.

Change-Id: I57db53160ca91618784f4e39da0a47322c070208
Task-number: QTBUG-27590
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRefactor recursive target logic out of default_post into function
Tor Arne Vestbø [Wed, 17 Oct 2012 12:13:19 +0000 (14:13 +0200)]
Refactor recursive target logic out of default_post into function

The qmake function prepareRecursiveTarget can now be used both by the
existing logic in default_post, as well as future recursive targets that
will be needed as part of the modularization of documentation builds.

Change-Id: Ibc72c3e224cb57c9f1796de3b04fda9de663dbb4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoUse the right properties when checking the frame's margins
Andy Shaw [Thu, 18 Oct 2012 13:34:26 +0000 (15:34 +0200)]
Use the right properties when checking the frame's margins

Changed it to check the Frame*Margin property instead of the
Block*Margin property as this was incorrect for a QTextFrameFormat.

Task-number: QTBUG-22173
Change-Id: I2c3066165fb592ed034874b1180593822859f933
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoadd a .qmake.conf file which load()s qt_build_config
Oswald Buddenhagen [Tue, 18 Sep 2012 20:01:10 +0000 (22:01 +0200)]
add a .qmake.conf file which load()s qt_build_config

that way we don't have to auto-generate code for that in the configures.

note that we now load qt_build_config.prf instead of just qmodule.pri,
which means that exceptions_off is set everywhere. we forcibly re-enable
them for testcases to minimize the deviation from default 3rd party usage.
testlib selftests are not qt testcases, so the one that needs exceptions
needs to enable them explicitly.

Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRemove dependency on QWindowsStyle in QGtkStyle
Jens Bache-Wiig [Wed, 17 Oct 2012 13:20:10 +0000 (15:20 +0200)]
Remove dependency on QWindowsStyle in QGtkStyle

Now that we no longer re-use the animation code in gtk,
it is time to remove this strange dependency.

Change-Id: Ib672a9b110dfba08d79b8654e572994007675957
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoBring back Mac dependent code in QBoxLayout, QGridLayout
Gabriel de Dietrich [Tue, 16 Oct 2012 14:53:09 +0000 (16:53 +0200)]
Bring back Mac dependent code in QBoxLayout, QGridLayout

We also made an accessibility auto-test more stable, so that it would
not be influenced by this patch.

Task-number: QTCREATORBUG-7966
Change-Id: I6ce4e2361c8847aee5dd1cf5664c29cd2d83e38d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoAdd new error strings to QRegularExpression
Giuseppe D'Angelo [Fri, 6 Jul 2012 10:37:26 +0000 (11:37 +0100)]
Add new error strings to QRegularExpression

They are introduced in PCRE 8.31.

Change-Id: Id0447b381d5e23996d4e87ae0368b07a8bc1c318
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoWindows QPA plugin: Parse arguments from list passed to factory.
Friedemann Kleint [Wed, 17 Oct 2012 13:18:28 +0000 (15:18 +0200)]
Windows QPA plugin: Parse arguments from list passed to factory.

Using dynamic properties on the native interface is deprecated.

Change-Id: Ia3411780dad15af61d4805c0d9fabf00dba92301
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
5 years agoTest: remove QSKIP in tst_qarraydata
Caroline Chao [Thu, 18 Oct 2012 12:25:36 +0000 (14:25 +0200)]
Test: remove QSKIP in tst_qarraydata

Instead omit the whole tests when appropriate.

Change-Id: Id4ec171528d4b4d6849b2478ac4f4a2332789b55
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP from tst_QTextStream::stillOpenWhenAtEnd
Caroline Chao [Thu, 18 Oct 2012 08:07:28 +0000 (10:07 +0200)]
Test: remove QSKIP from tst_QTextStream::stillOpenWhenAtEnd

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: Ifd09048687db95913f39a64cffb42a743af8fa81
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoMake sure we copy *all known events* properly in order to not assert.
Jan Arve Saether [Thu, 18 Oct 2012 09:21:20 +0000 (11:21 +0200)]
Make sure we copy *all known events* properly in order to not assert.

This caused the following assertion in tst_QAccessibility::listTest():
ASSERT: "m_type != QAccessible::TableModelChanged" in file
qaccessible.h, line 455

Change-Id: If1f1e80521f346019bdbd59aac58e30c870d6e4e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoFix compile with -no-widgets
Rohan McGovern [Thu, 18 Oct 2012 01:14:57 +0000 (11:14 +1000)]
Fix compile with -no-widgets

Remove more unnecessary references to QtWidgets in accessibility

Disable accessibility tests (which rely on QtWidgets) when QtWidgets is
not available.

Change-Id: I57315537779d31af1245d42d1b4c49174016da54
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoTest: remove QSKIP in tst_QDataStream::stream_QIcon
Caroline Chao [Thu, 18 Oct 2012 07:56:57 +0000 (09:56 +0200)]
Test: remove QSKIP in tst_QDataStream::stream_QIcon

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: Ic69accb138121d2b39f068cef181da13b18e46ee
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP in tst_file
Caroline Chao [Thu, 18 Oct 2012 07:31:51 +0000 (09:31 +0200)]
Test: remove QSKIP in tst_file

Instead omit the whole tests when appropriate.

Change-Id: I5eae127a497e290c5e4ba1a81a8f325c300471c1
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP in tst_QDir::dotAndDotDot
Caroline Chao [Thu, 18 Oct 2012 07:16:27 +0000 (09:16 +0200)]
Test: remove QSKIP in tst_QDir::dotAndDotDot

Instead omit the omit the whole test when Q_OS_WINCE is defined.

Change-Id: I8c0f12c63bbc4567edb3a8626ab060d5ce38f3cd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agonormalise signal/slot signatures [QtOpenGL tests]
Marc Mutz [Tue, 16 Oct 2012 09:15:37 +0000 (11:15 +0200)]
normalise signal/slot signatures [QtOpenGL tests]

Change-Id: Ie8a56873013ad2408d792e371a7d3e2ecf1f9c2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoFix for memory leak in ResultStore
Christian Strømme [Tue, 16 Oct 2012 09:34:00 +0000 (11:34 +0200)]
Fix for memory leak in ResultStore

In ResultStoreBase::addResults() it possible that the ResultItem we
create is invalid (filter-mode enabled). Since an invalid ResultItem
won't have any result data, we need to make sure that we don't allocate
any data for it.

Task-number: QTBUG-27224
Change-Id: Ic99b191db0e9dd4e29b64911f87d90a8148bb7a5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoMac: Fix QLineEdit shadow
Gabriel de Dietrich [Wed, 17 Oct 2012 16:53:01 +0000 (18:53 +0200)]
Mac: Fix QLineEdit shadow

The cursor is still rendered 1px too low, but probably needs to be
fixed in QTextLayout.

Change-Id: Ie56c7140898b941c8d896f503ce1934d0d681a4d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoImprove branch indicators in common style
Jens Bache-Wiig [Wed, 17 Oct 2012 07:48:10 +0000 (09:48 +0200)]
Improve branch indicators in common style

The branch indicators in common style was painted based on motif
style, effectively making it useless.

Since most styles inherit from Windows style, I
moved that into common style. It was already duplicating
most of the code used in commonstyle.

Change-Id: I1a383d90254bb97aebc038fa058ec0f225cf9dab
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
5 years agoFix compilation with MinGW-w64
Jonathan Liu [Wed, 17 Oct 2012 12:47:20 +0000 (23:47 +1100)]
Fix compilation with MinGW-w64

Change-Id: I0c9e6adc54ccce34e0f81af048f2a51a4ac051b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoWindows: Multisampling is disabled by default.
Friedemann Kleint [Wed, 17 Oct 2012 14:18:59 +0000 (16:18 +0200)]
Windows: Multisampling is disabled by default.

The previous code assumed that -1 indicated some sort of "auto",
but this is not the case according to documentation.

Task-number: QTBUG-27600
Change-Id: Id17ce32f94ded61a63a33d0c04ec5312f53c7923
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Friedemann Kleint [Wed, 17 Oct 2012 13:22:58 +0000 (15:22 +0200)]

Change-Id: Ieffa1f483cddd220b158ccd570af151420c8e3c3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
5 years agoTest: remove QSKIP and remove whole test cases instead.
Caroline Chao [Tue, 16 Oct 2012 10:01:16 +0000 (12:01 +0200)]
Test: remove QSKIP and remove whole test cases instead.

Change-Id: I8b625d20a2cf9215cbfdb96cd252bf1c81bba522
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP in tst_QDBusMarshall::receiveUnknownType
Caroline Chao [Tue, 16 Oct 2012 10:07:21 +0000 (12:07 +0200)]
Test: remove QSKIP in tst_QDBusMarshall::receiveUnknownType

Omit the whole test and relative types if DBUS_TYPE_UNIX_FD is not defined
since the test is not relevant in that case (D-Bus library too old).

Change-Id: I167622f485c0f34d64984c4fa96be974e54f56bc
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP from tst_qtconcurrent
Caroline Chao [Wed, 17 Oct 2012 08:02:57 +0000 (10:02 +0200)]
Test: remove QSKIP from tst_qtconcurrent

Instead omit the whole tests when appropriate.

Change-Id: I3a22d010b658e54d7d234b786173c62977a50c7d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoThere's no uic3 anymore
Thiago Macieira [Wed, 17 Oct 2012 00:20:33 +0000 (17:20 -0700)]
There's no uic3 anymore

Change-Id: Iacbe2e6a802278c2c82ae60551eae5bc2636e6f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoAdd qlibraryinfo.h to global.pri's HEADERS list
Thiago Macieira [Mon, 15 Oct 2012 20:48:07 +0000 (13:48 -0700)]
Add qlibraryinfo.h to global.pri's HEADERS list

The file was already present but wasn't mentioned.

Change-Id: Icac4fd5276b071ed2173e72aed51abb4c0b5b50a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix potential crash in QStyleAnimation::updateCurrentTime()
J-P Nurmi [Tue, 16 Oct 2012 15:39:52 +0000 (17:39 +0200)]
Fix potential crash in QStyleAnimation::updateCurrentTime()

A parentless/targetless QStyleAnimation calls updateCurrentTime() from
QAbstractAnimation constructor. Avoid the potential crash even if it's
not a valid use case for QStyleAnimation.

Change-Id: I9cd263d105c8ea4b5cbabac9a7680991745ccd95
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoStyles: revise indeterminate progress bar animations
J-P Nurmi [Tue, 16 Oct 2012 14:35:34 +0000 (16:35 +0200)]
Styles: revise indeterminate progress bar animations

Remove dependencies to QProgressBar where possible. This makes
it possible to animate for example QQuickItem based progress
bars (read: the desktop components).

Change-Id: If208506702365895576238c24191b8d70b90841c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoCocoa: remove current contentView when clearing window
Teemu Katajisto [Wed, 10 Oct 2012 13:05:22 +0000 (16:05 +0300)]
Cocoa: remove current contentView when clearing window

Otherwise they might be still events sent to view with no
proper QWindow. Also, add dealloc QNSView for clean up.

Task-number: QTBUG-26580
Task-number: QTBUG-27456
Change-Id: Icdbe5c39490b72ec82795c2d71e5671cea81921e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoQGraphicsObject: handle QEvent::StyleAnimationUpdate
J-P Nurmi [Mon, 15 Oct 2012 12:23:07 +0000 (14:23 +0200)]
QGraphicsObject: handle QEvent::StyleAnimationUpdate

Change-Id: I8545d6f26e2c2398e750b0b85ba87892a2e376ae
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoAccessibility doesn't need QApp from QWidgets.
Frederik Gladhorn [Wed, 17 Oct 2012 09:29:26 +0000 (11:29 +0200)]
Accessibility doesn't need QApp from QWidgets.

Change-Id: I440179bfa95d6aa73c8b69b09431e4dc9fae5436
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoQPlatformWindow: change API for QPlatformWindow::setWindowState
Richard Moe Gustavsen [Tue, 9 Oct 2012 08:52:44 +0000 (10:52 +0200)]
QPlatformWindow: change API for QPlatformWindow::setWindowState

The current implementation requests the platform window to set
the window state if it can, and return the actual window state

The problem with this approach is that the platform window is created
as late as possible, so a call to QWindow::setWindowState would in
many (most?) cases never be forwarded to the platform window (instead,
the platform window is responsible to check the current window state
upon creation). As such, the window state might be left unsynched with
the platform window.

This patch suggests removing the return value from
QPlatformWindow::setWindowState. This will at least be consistent, so
that setting/getting state would produce the same result independent of
delayed window creation. If needed, we can later add new API to
QPlatformIntegration or QPlatformWindow for querying supported/actual
window state.

Change-Id: Ie43f56169656854a765ce88b47a808f8f3d51bb4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoFixed cube opengl example
Oliver Wolff [Tue, 16 Oct 2012 11:51:05 +0000 (13:51 +0200)]
Fixed cube opengl example

Proper variable initialization should fix crashs and black screens for
that example.

Task-number: QTBUG-27281
Task-number: QTBUG-27021
Change-Id: I538f233ea3c2faf6c1864c46be0d03828e92a110
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoRemove visibility attribute from function body in QtDBus
Thiago Macieira [Tue, 16 Oct 2012 00:34:48 +0000 (17:34 -0700)]
Remove visibility attribute from function body in QtDBus

Those were using an inconsistent macro compared to the function
declaration in qdbusthreaddebug_p.h.

Change-Id: I3e77ba83ceedc99cb1f957fdfe318e34ab9c9628
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoRemove mention of freetype options in configure.
Samuel Rødal [Wed, 3 Oct 2012 06:45:55 +0000 (08:45 +0200)]
Remove mention of freetype options in configure.

These options were only used for QWS in 4.x, and their documentation
should have been removed as part of f220f99a6d13a395ca723e9f9.

Task-number: QTBUG-27369
Change-Id: Ia85a20bdac40087c02f6876f53ce21568759d697
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoAdd QDrag class to 'draganddrop' group
Gatis Paeglis [Tue, 16 Oct 2012 15:35:14 +0000 (17:35 +0200)]
Add QDrag class to 'draganddrop' group

Change-Id: I0cb96f57486dbda7cb9ca19556515e1b2b4f6c3e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoBring back MacSizeChange event
Gabriel de Dietrich [Tue, 16 Oct 2012 14:19:51 +0000 (16:19 +0200)]
Bring back MacSizeChange event

This ensures WA_MacNormalSize & Co. work (almost) properly.

Task-number: QTCREATORBUG-7966
Change-Id: Ib03b5c0f163409e2bc387f6cf9b56c72c43caec7
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoQFileInfoGatherer: remove m_resolveSymlinks for non-Q_OS_WIN
Marc Mutz [Tue, 7 Aug 2012 17:44:09 +0000 (19:44 +0200)]
QFileInfoGatherer: remove m_resolveSymlinks for non-Q_OS_WIN

For some reason, m_resolveSymlinks was never set to true for
non-Windows systems. The constructor set it to false and the
setter was only implemented for Windows.

So remove the member and code that is only executed if it
is set to true, except on Windows.

Change-Id: I386e980688a603475a413e2ef3628d0754778c5c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoTest: remove QSKIP in tst_QSharedPointer::lambdaCustomDeleter
Caroline Chao [Tue, 16 Oct 2012 10:15:13 +0000 (12:15 +0200)]
Test: remove QSKIP in tst_QSharedPointer::lambdaCustomDeleter

Instead omit the whole test when Q_COMPILER_LAMBDA is not defined since
the test is not relevant in that case.

Change-Id: I541da96a881fa0c9be38ae5c0f86df047dd8fc6b
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP from tst_QThread::stressTest
Caroline Chao [Tue, 16 Oct 2012 10:29:03 +0000 (12:29 +0200)]
Test: remove QSKIP from tst_QThread::stressTest

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: Id6f4e65c994115b8bab45f9fbf21dd255d204ea6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP from tst_QSocketNotifier::posixSockets
Caroline Chao [Tue, 16 Oct 2012 10:32:17 +0000 (12:32 +0200)]
Test: remove QSKIP from tst_QSocketNotifier::posixSockets

Instead omit the whole test when Q_OS_UNIX is not defined.

Change-Id: If0ee3345c25f6b1baa38845edfd08ec26a45d6f2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP in tst_QDirIterator::hiddenDirs_hiddenFiles
Caroline Chao [Tue, 16 Oct 2012 12:32:37 +0000 (14:32 +0200)]
Test: remove QSKIP in tst_QDirIterator::hiddenDirs_hiddenFiles

Instead omit the whole test when Q_OS_WIN is defined.

Change-Id: I08060168edb2353f4960129b1c0654fea165ca6c
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP in tst_QDataStream::stream_QPixmap
Caroline Chao [Tue, 16 Oct 2012 12:39:15 +0000 (14:39 +0200)]
Test: remove QSKIP in tst_QDataStream::stream_QPixmap

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: I356af3ea145012142b3cf2af0b5d813d4be07a25
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTest: remove QSKIP from tst_LargeFile::mapOffsetOverflow
Caroline Chao [Tue, 16 Oct 2012 13:08:35 +0000 (15:08 +0200)]
Test: remove QSKIP from tst_LargeFile::mapOffsetOverflow

Instead omit the whole test when Q_OS_MAC is defined.

Change-Id: I7d35c99ecd69b3c5bb8f8590342edd9665300709
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoClarify ownership of scene in QGraphicsView::setScene() docs.
Mitch Curtis [Fri, 12 Oct 2012 08:08:41 +0000 (10:08 +0200)]
Clarify ownership of scene in QGraphicsView::setScene() docs.

Change-Id: I550a02bce0633884ee1ffe2321c6462a34194f89
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agorestore compat with old perl: don't use \h in regexps
Oswald Buddenhagen [Fri, 12 Oct 2012 19:42:19 +0000 (21:42 +0200)]
restore compat with old perl: don't use \h in regexps

Task-number: QTBUG-27543
Change-Id: I94a1368de69faeabe359e2c5e1f22879e9e96cc8
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agofix syntax of warning message
Oswald Buddenhagen [Thu, 11 Oct 2012 13:16:48 +0000 (15:16 +0200)]
fix syntax of warning message

Change-Id: I2e0a9afd6e46534156b7277dc5ceaf85d2dd4cac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQWindowsKeyMapper: use a more efficient data structure for 'keyLayout'
Marc Mutz [Wed, 10 Oct 2012 16:27:04 +0000 (18:27 +0200)]
QWindowsKeyMapper: use a more efficient data structure for 'keyLayout'

Instead of allocating small chunks (40 bytes) on the heap, use a contiguous
array to hold them. This always occupies 10240 bytes of memory instead of
1024 (32 bits) or 2048 (64 bits) for the pointer array (plus heap memory
which depends on the number of items allocated), but is more cache-friendly
and uses less memory when the array isn't sparse.

To emulate the nullptr, a new bool has been added (doesn't change

Also replace a few more magic numbers by symbolic constants.

Change-Id: I7160f600faddd63deea265c89dc6fd857c7b557f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
5 years agoQWindowsKeyMapper: remove dead code
Marc Mutz [Wed, 10 Oct 2012 16:02:57 +0000 (18:02 +0200)]
QWindowsKeyMapper: remove dead code

As an array of automatic storage duration, 'keyLayout' can never be nullptr,
so remove the respective check.

Change-Id: I2fb2db8311de55b41a1f9aef7c35341949e38e5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
5 years agoQWindowsKeyMapper: replace one magic constant with a symbolic one
Marc Mutz [Wed, 10 Oct 2012 15:52:21 +0000 (17:52 +0200)]
QWindowsKeyMapper: replace one magic constant with a symbolic one

Replace occurrences of a literal 9 that mean 'number of modifier key
combinations' with the new symbolic constant NumMods.

Change-Id: I1e78a1a3c00b81095450ec0557e30751da44c39a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
5 years agoQScreen manual test improvements: fields resize, better formatting
Shawn Rutledge [Thu, 4 Oct 2012 13:43:11 +0000 (15:43 +0200)]
QScreen manual test improvements: fields resize, better formatting

It's necessary to set the fieldGrowthPolicy on the QFormLayout in order
to have expanding fields on the Mac.  Geometry formatting with
negative x and y values looks better.  Display fewer
decimal digits for double fields.

Change-Id: Icb252c0c3fb7b605253e04c3361beba124570840
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoCompile fix for AIX with xlc
Andy Shaw [Tue, 9 Oct 2012 21:13:41 +0000 (23:13 +0200)]
Compile fix for AIX with xlc

The -qtls option is needed when building with thread support so it can
use the local thread storage.

Change-Id: I693d944efddac911fe03b2c9a6b06a28f112b54d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoRemove addition of dependencies for static libraries.
Stephen Kelly [Tue, 16 Oct 2012 10:26:42 +0000 (12:26 +0200)]
Remove addition of dependencies for static libraries.

The content in the prl file is not compatible with what CMake
expects in the value of the IMPORTED_LINK_INTERFACE_LIBRARIES
property. That property expects a list of IMPORTED targets or
full paths to libraries.

The prl file gives us a whitespace separated string of content
suitable for passing to ld, that is, it contains -L and -l content.
As this would take a lot of error prone parsing in cmake code in
order to resolve the content to a list of full paths to libraries
(which can be processed by any cmake generator), it's better to
remove the code until qmake is able to generate a list of full

Change-Id: I72fe8e862b7f3bd25a7f9a03db94d2e9b815d08a
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoQComboBox: mention insert policy in context of editable property
Mark Brand [Tue, 16 Oct 2012 10:47:09 +0000 (12:47 +0200)]
QComboBox: mention insert policy in context of editable property

This makes it a little bit easier for the reader to discover what
editable combo boxes are about.

Change-Id: I60ce571f01e32d4cacb4718b42a8e12884bd1c13
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
5 years agoimplement QCocoaWindow::setWindowIcon
Joerg Bornemann [Thu, 4 Oct 2012 11:19:32 +0000 (13:19 +0200)]
implement QCocoaWindow::setWindowIcon

Code taken from Qt 4.8.

Task-number: QTBUG-27175

Change-Id: I0f7a1add3ea63761c956e43d591cd1b26f25760e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoAdd parameter documentation.
Frederik Gladhorn [Tue, 16 Oct 2012 10:58:32 +0000 (12:58 +0200)]
Add parameter documentation.

Change-Id: I8ce85bbb286c3cb844ef600daa5e99432ee55b74
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoFix incorrectly scaled constants on Mac
Jens Bache-Wiig [Tue, 16 Oct 2012 12:44:55 +0000 (14:44 +0200)]
Fix incorrectly scaled constants on Mac

This fixes several scaled constants on mac that are inherited from
commonstyle. (such as toolbutton arrows) It is probably easiest
to see when running Windows style on mac.
The problem was that the code assumed a default dpi of 96 would be
used on all platforms.

Change-Id: I83789589009b268dcb1d96629c3ec9e8f968a891
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
5 years agoDocument needed packages for XCB on Fedora.
Niels Weber [Tue, 16 Oct 2012 07:58:12 +0000 (09:58 +0200)]
Document needed packages for XCB on Fedora.

Change-Id: I415416e82d342b232607fe7087350a9dad615f7a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoAdd QObject* QStyleOption::styleObject
J-P Nurmi [Mon, 15 Oct 2012 12:10:58 +0000 (14:10 +0200)]
Add QObject* QStyleOption::styleObject

The object is used, amongst other things, as a target for
sending style animation updates.

Change-Id: Ic210e7ae2111bc08b70331a3a2030a494919a06d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoMark linux accessibility test as insignificant.
Frederik Gladhorn [Tue, 16 Oct 2012 12:34:14 +0000 (14:34 +0200)]
Mark linux accessibility test as insignificant.

The test was not run so far and chances are that it would block
the CI completely.
So disable it for now, enable it again as soon as breakages have been fixed.

Change-Id: I452c02027b37a604eefbadb253c9a4d5041ef159
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoImplement setWindowIcon() for Windows.
Miikka Heikkinen [Tue, 16 Oct 2012 10:06:43 +0000 (13:06 +0300)]
Implement setWindowIcon() for Windows.

Platform implementation for QWindow::setWindowIcon() was missing from
Windows platform plugin.

Task-number: QTBUG-27175
Change-Id: I6807d1ded057b7788a9f2fa5b143e212a666029b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoTest: remove QSKIP in tst_QCoreApplication::argc
Caroline Chao [Tue, 16 Oct 2012 10:37:23 +0000 (12:37 +0200)]
Test: remove QSKIP in tst_QCoreApplication::argc

Instead omit the whole test when Q_OS_WIN is defined since
the test is invalid on this platform.

Change-Id: Idb77df96b0c2a223cddbfffb4e24c6d1f5d33dfb
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>