profile/ivi/qtbase.git
11 years agoqdoc: Listing group members across modules
Martin Smith [Tue, 27 Nov 2012 13:07:27 +0000 (14:07 +0100)]
qdoc: Listing group members across modules

This is a first attempt at fixing the problem, but
it probably is not the entire solution. The problem
requires adding attributes to the index files and
then reusing them when the index files are read.
The same problem will be affecting the module
lists themselves, but that is not fixed in this
update.

Task-number: QTBUG-28036
Change-Id: I8593d5b9446e51a5204b6c71f8c4f2b63f445972
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoProperly deprecated QGLFramebufferObject and QGLFramebufferObjectFormat
Samuel Rødal [Tue, 27 Nov 2012 13:49:39 +0000 (14:49 +0100)]
Properly deprecated QGLFramebufferObject and QGLFramebufferObjectFormat

Change-Id: I9affdcce0988e3538c8a7a696999a7cf8c3448aa
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRemove remaning TARGET.EPOCHEAPSIZE settings from examples.
hjk [Tue, 27 Nov 2012 13:12:37 +0000 (14:12 +0100)]
Remove remaning TARGET.EPOCHEAPSIZE settings from examples.

Not needed anymore.

Change-Id: I28b6566e1498afb68295c16e8786fe8bc0256361
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
11 years agoImprove OpenGL docs
Jan Arve Saether [Tue, 27 Nov 2012 14:09:17 +0000 (15:09 +0100)]
Improve OpenGL docs

* Mark all Open GL classes with \inmodule QtOpenGL. Otherwise, they
  weren't listed in the list of classes.
* Remove a reference to Motif

Change-Id: I75680712b212cf46b869014d3678b56d022c6323
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFixed abbreviations in QWindow::framePos() and QWindow::setFramePos().
Samuel Rødal [Tue, 27 Nov 2012 13:57:19 +0000 (14:57 +0100)]
Fixed abbreviations in QWindow::framePos() and QWindow::setFramePos().

As 672e7c875e8680818e23d0aef98129d95eb7e91c did changing pos() to
position() and setPos() to setPosition().

Luckily there's not much code that uses these.

Change-Id: I1e1982f00412a22bd376e667a5e8c30b6149f9b5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoremove dependency of fusion style on windows
Tasuku Suzuki [Fri, 23 Nov 2012 04:45:33 +0000 (13:45 +0900)]
remove dependency of fusion style on windows

Fusion does not depend on Windows
qfeatures.h regenerated from qfeatures.txt
(QT_NO_LIBRARY and QT_NO_STYLE_FUSION were missing)

Change-Id: I5e650a826abb788c7ffb1f0f28d9bbb2d357b7a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix link to licensing page
Lars Knoll [Tue, 27 Nov 2012 11:49:35 +0000 (12:49 +0100)]
Fix link to licensing page

Change-Id: I398a9e46fd9c4beacd9e8554dab544154e48b870
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoDoc: write qttestlib.qch, not qttest.qch
hjk [Mon, 26 Nov 2012 16:33:38 +0000 (17:33 +0100)]
Doc: write qttestlib.qch, not qttest.qch

This is an enabler for https://codereview.qt-project.org/#change,40381

Change-Id: I2c2fdefab041dc9332816aefbe85ff66c275ca63
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMac: Fix wheel event handling on 10.6
Liang Qi [Mon, 26 Nov 2012 13:29:46 +0000 (14:29 +0100)]
Mac: Fix wheel event handling on 10.6

Change "else" case to support compiling on 10.7+
and deploying on 10.6

Task-number: QTBUG-28060
Change-Id: Iaaeaaefe98083863ed750c7cb320db02e16543af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix overview documentation.
Lars Knoll [Mon, 26 Nov 2012 18:59:57 +0000 (19:59 +0100)]
Fix overview documentation.

Change-Id: I8a3427be51673d071bcf467ea7d6d12472b6f841
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoEnsure subfocus is not reset to 0 when hiding a panel.
Andreas Aardal Hanssen [Fri, 23 Nov 2012 10:48:27 +0000 (11:48 +0100)]
Ensure subfocus is not reset to 0 when hiding a panel.

When hiding any widget that is not a panel, it is correct to clear
subfocus. In case clearFocus() has been called, the result is that
focusItem() / focusWidget() points to 0, which is correct. Upon
reactivation, nothing gains input focus. When changing focus, the
following setSubFocus() call will ensure subfocus points to the new
widget.

When hiding a panel, however, it's essential that subfocus within
that panel is not cleared, otherwise, when re-showing the panel,
nothing will have focus, whereas the expected behavior is that focus
is restored to the last item that had focus, i.e., the focusItem()
a.k.a. subfocus widget.

Task-number: QTBUG-22256
Change-Id: I84d849a505764e074e1369fef923cef1ad5c0b1e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agotr()-Fix: Do not add up translateable strings.
Friedemann Kleint [Mon, 26 Nov 2012 15:44:26 +0000 (16:44 +0100)]
tr()-Fix: Do not add up translateable strings.

Placeholders might go to a different position in translated
strings.

Change-Id: Id6a84ea931dc0487bd72eb8d01669369a3dce9c6
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoAllow qmljsdebugger argument and value to be separated by a space
Aurélien Gâteau [Thu, 11 Oct 2012 09:15:03 +0000 (11:15 +0200)]
Allow qmljsdebugger argument and value to be separated by a space

This change makes it possible to use the QML JS debugger with KDE
applications.

Change-Id: Id5838fa34dcb8b54127abc6da6fe7c2e9a5a1c2e
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQMacStyle: cleanup unused includes
J-P Nurmi [Fri, 23 Nov 2012 23:04:17 +0000 (00:04 +0100)]
QMacStyle: cleanup unused includes

Change-Id: I8fbc33f86fac5abed4553d35fac2973f47a445e9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoFixed crash in tst_qglthreads.
Samuel Rødal [Mon, 26 Nov 2012 15:39:40 +0000 (16:39 +0100)]
Fixed crash in tst_qglthreads.

QGLTextureCache has a read write locker to protect texture lookups.
However, even calling QCache::object() might modify the cache, causing
race conditions, since it modifies the priority order of the objects in
the cache. Therefore, we need to protect it with a QWriteLocker instead
of a QReadLocker.

Task-number: QTBUG-22560
Change-Id: I46fffc624ace27e25fb100f865e1df0a19b9093d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoFix example paths in example manifests that are used by Qt Creator.
Eike Ziller [Mon, 26 Nov 2012 14:28:46 +0000 (15:28 +0100)]
Fix example paths in example manifests that are used by Qt Creator.

Task-number: QTBUG-27801
Change-Id: I345c009fc0e4e1c1eabb43ad142e3b474e7a6fee
Reviewed-by: hjk <qthjk@ovi.com>
11 years agotr()-Fix: Shorten QFtp error message.
Friedemann Kleint [Mon, 26 Nov 2012 15:24:59 +0000 (16:24 +0100)]
tr()-Fix: Shorten QFtp error message.

Change-Id: Id2a901c31eafb35bdbbc187f1e5edb74212c361a
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoMac: Reworking flat QGroupBox look
Gabriel de Dietrich [Fri, 9 Nov 2012 15:27:46 +0000 (16:27 +0100)]
Mac: Reworking flat QGroupBox look

The line has been removed, giving a globally cleaner appearance. Also,
the label font size has been increased to normal size.

Change-Id: I3ef9d59ca54755c6fa158e943e4a6ce94eb05065
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoRemove last usages of qSin and friends from QQuaternion
Sean Harmer [Mon, 26 Nov 2012 14:26:46 +0000 (14:26 +0000)]
Remove last usages of qSin and friends from QQuaternion

Change-Id: I93fe1d22313da4cfa671603ccdbe9ac8f02cd73b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoExamples: inherit NorwegianWoodStyle from QProxyStyle
J-P Nurmi [Mon, 26 Nov 2012 12:24:12 +0000 (13:24 +0100)]
Examples: inherit NorwegianWoodStyle from QProxyStyle

The QStyle specializations are being made internal. The recommended way
to customize styles is now to use QProxyStyle (& QStyleFactory), or to
implement a full custom style one can alternatively subclass
QCommonStyle. The proxy style approach was chosen for this case, since
the example assumes some drawing functionality provided by the windows
style and it is not a "complete" custom style implementation but more
like a customization anyway.

Change-Id: Ib2477339cfef258cfc944a76a2eea728066e1f45
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoqmake: Change copyright information from Nokia to Digia
Sergio Ahumada [Mon, 26 Nov 2012 11:47:10 +0000 (12:47 +0100)]
qmake: Change copyright information from Nokia to Digia

Task-number: QTBUG-28156
Change-Id: If54615a465504b4124891fb393185eb324372874
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
11 years agoMoving code for PE_IndicatorArrow* from windows to common style
Thomas Hartmann [Mon, 26 Nov 2012 13:13:25 +0000 (14:13 +0100)]
Moving code for PE_IndicatorArrow* from windows to common style

If QCommonStyle is taking the place of a common base style,
it should support PE_IndicatorArrow*.

Change-Id: Iec08a37bf3a501bcca61751b11e907999f538e34
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoWidgets/Painting examples: inherit ArthurStyle from QCommonStyle
J-P Nurmi [Mon, 26 Nov 2012 14:38:43 +0000 (15:38 +0100)]
Widgets/Painting examples: inherit ArthurStyle from QCommonStyle

The QStyle specializations are being made internal. The ArthurStyle
does not seem to require anything from QWindowsStyle, but QCommonStyle
as a base class gives just as nice looks.

Change-Id: I5ad8dd881e03f166ae5d3aedccb2688952dc0a28
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoEnsure QMAKE_PRL_LIBS is a unique list.
Friedemann Kleint [Mon, 26 Nov 2012 11:27:53 +0000 (12:27 +0100)]
Ensure QMAKE_PRL_LIBS is a unique list.

Windows static builds currently fail due to overlong command
link lines containing multiple occurrences of base libraries.

Task-number: QTBUG-28131
Change-Id: Ibf7f551fc98c879111b32b27a16f4e96260743c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoOnly allow caching for HTTP GET and HEAD requests.
Michael Brüning [Fri, 23 Nov 2012 20:26:36 +0000 (21:26 +0100)]
Only allow caching for HTTP GET and HEAD requests.

Added a method to QNetworkReplyHttpImplPrivate to check whether the
HTTP operation used in the current request allows for caching. This
should only be the case if the operation is GET or HEAD. The response
to all other request are not really cacheable and should be disallowed
from caching.

Change-Id: I7c31bae42814d157a800d43565e5cb9adfb879f7
Task-number: QTBUG-28035
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
11 years agoFix build error with QT_NO_FILESYSTEMITERATOR
Tasuku Suzuki [Sat, 24 Nov 2012 14:45:22 +0000 (23:45 +0900)]
Fix build error with QT_NO_FILESYSTEMITERATOR

Change-Id: If39f1077ab1cb126632ea77d998fc279aabbcd5c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoconfigure: clean up unused CFG_IM
Tasuku Suzuki [Sat, 24 Nov 2012 20:23:51 +0000 (05:23 +0900)]
configure: clean up unused CFG_IM

Change-Id: I91a09e29a3bf79610a34c30ffe9c145c7e76d1b6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoChange contact-us from Nokia to Digia
Sergio Ahumada [Mon, 26 Nov 2012 11:27:10 +0000 (12:27 +0100)]
Change contact-us from Nokia to Digia

Change-Id: I0d94b66d802c3899009dde1e570f195aadd861dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoChange license header from Nokia to Digia
Sergio Ahumada [Mon, 26 Nov 2012 11:35:02 +0000 (12:35 +0100)]
Change license header from Nokia to Digia

Change-Id: I2be215284d7670f60f8b5838fce1e6832dde2270
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoMove isBuiltinType() to namespace QtPrivate and export it.
Friedemann Kleint [Mon, 26 Nov 2012 09:57:14 +0000 (10:57 +0100)]
Move isBuiltinType() to namespace QtPrivate and export it.

There is currently a symbol clash with a duplicated
isBuiltinType() in ActiveQt's dumpcpp-tool, which breaks static
building. Reuse the function.

Task-number: QTBUG-28131
Change-Id: I4985e8405924754aa613311ca3f06d6ba29758b8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoBlackBerry mkspecs: optimize linker flags
Peter Hartmann [Fri, 23 Nov 2012 16:32:50 +0000 (17:32 +0100)]
BlackBerry mkspecs: optimize linker flags

* relro makes some sections read-only before giving control to the
program;
* now resolves all symbols when the program is started and allows for
 the GOT being marked read-only to prevent it from being overwritten.

These settings have been used internally for device builds already.

Change-Id: I9f62fffe618c75748e2357d1686289c23c5dbee5
Reviewed-by: Greg Bentz <gbentz@rim.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoAllow qdocconf to specify where the examples are located in install.
Eike Ziller [Mon, 26 Nov 2012 12:54:43 +0000 (13:54 +0100)]
Allow qdocconf to specify where the examples are located in install.

We have qdoc configurations for the different qtbase libraries and
modules now, which specify e.g. "../../../examples/opengl" for the
exampledirs. That means that qdoc finds examples like
"2dpainting/2dpainting.pro" which is then installed into
"[QT_INSTALL_EXAMPLES]/opengl/2dpainting/2dpainting.pro". (At the moment
even into "[QT_INSTALL_EXAMPLES]/qtbase/opengl/...", which will be
changed to match the structure in source.)

In order for Qt Creator to find the examples, qdoc must write the path
behind [QT_INSTALL_EXAMPLES] into the example manifest file. This patch
introduces "examplesinstallpath" that allows qdoc configs to specify the
missing part, e.g. the opengl qdocconf can add

examplesinstallpath = opengl

to tell qdoc that the examples will be installed into
"[QT_INSTALL_EXAMPLES]/opengl/"

Task-number: QTBUG-27801
Change-Id: Idf518e16d3ca0f9522b084e92f34725b93e9d11f
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoCleanup QCoreApplication::Type letfover docs
J-P Nurmi [Mon, 26 Nov 2012 11:06:32 +0000 (12:06 +0100)]
Cleanup QCoreApplication::Type letfover docs

The enum was removed in 553e21.

Change-Id: I29bf049010b0424af3ca00095d8a36d53a7538e4
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agodocs: mark QMacStyle internal
J-P Nurmi [Mon, 26 Nov 2012 12:48:48 +0000 (13:48 +0100)]
docs: mark QMacStyle internal

QMacStyle was made internal in 27aa41, but was accidentally
left public in the docs.

Change-Id: Id7841718af3a21bbbda3102858d1a11bccb8179b
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoExamples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$example
hjk [Mon, 26 Nov 2012 13:04:31 +0000 (14:04 +0100)]
Examples: Install to $$[QT_INSTALL_EXAMPLES]/$submodule/$example

This makes the structure of the examples after an 'make install'
similar to the one in a 'developer build'.

Change-Id: I9120bd741fab332e64e30adc01cefe87e5633454
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoqmake: Test recursive function calls
Konstantin Ritt [Mon, 26 Nov 2012 05:39:34 +0000 (07:39 +0200)]
qmake: Test recursive function calls

Change-Id: If7d659728d30b2e5c52082ab999bc00de3733972
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoDelete codecs page
Lars Knoll [Mon, 26 Nov 2012 12:12:36 +0000 (13:12 +0100)]
Delete codecs page

Unused and empty. QTextCodec and the Unicode overview
contains all relevant information.

Change-Id: I779ba4dea69a88802e34541e4ba44215b5d69c2a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agotst_QSharedPointer: update application types
J-P Nurmi [Mon, 26 Nov 2012 11:22:45 +0000 (12:22 +0100)]
tst_QSharedPointer: update application types

QCoreApplication::Type enum was removed in 553e21. This change updates
the (un)tested application types to match the application types
available in Qt 5.

Change-Id: I8631987a9ff31dc81baa013619cfc18616b851d1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agotst_QGridLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 15:00:46 +0000 (16:00 +0100)]
tst_QGridLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: If163aae6910c0b082a9bcca1ebbab66660cc005f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QFormLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:58:15 +0000 (15:58 +0100)]
tst_QFormLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: Ie28d4ea074938b17827aa803a2298f881946f7e5
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QBoxLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:56:13 +0000 (15:56 +0100)]
tst_QBoxLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: I287c771a841ba96e445f0a0df96ea035be25ac74
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QMenuBar: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:54:19 +0000 (15:54 +0100)]
tst_QMenuBar: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: I422e7d67fadbb169d19285aab0a8ba0f3d668697
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QComboBox: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:50:48 +0000 (15:50 +0100)]
tst_QComboBox: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: Ic76ecc20ff600a7d401b44c8dc4d93198c06becc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoFix keyboard grab in QWidgetWindow.
Friedemann Kleint [Fri, 23 Nov 2012 16:26:25 +0000 (17:26 +0100)]
Fix keyboard grab in QWidgetWindow.

Task-number: QTBUG-28070
Change-Id: I6f55a2dd906ee896071137a5d47fb97c9a571b5f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agofix wrong comment about #ifdef's end
Peter Kümmel [Thu, 22 Nov 2012 22:13:00 +0000 (23:13 +0100)]
fix wrong comment about #ifdef's end

Change-Id: I8a627c01ced1163e3ea72e9e2b1b55da04ca91b2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoEnable module build with QT_NO_CODECS
Tasuku Suzuki [Thu, 22 Nov 2012 20:34:42 +0000 (05:34 +0900)]
Enable module build with QT_NO_CODECS

Change-Id: I27239384a7676a81495a9d3f7484975d2f277e8c
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoChange QTextLayout::textOption() to return a const reference instead
Andy Shaw [Sat, 24 Nov 2012 09:40:29 +0000 (10:40 +0100)]
Change QTextLayout::textOption() to return a const reference instead

By changing textOption() to return a const reference we will get a
performance increase when accessing this function internally.

Task-number: QTBUG-28193
Change-Id: I65b594d844ebaee6d72f4a95d11bd2c5e801fab4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agomoc: Fix assertion in QVector::first()
Konstantin Ritt [Sun, 25 Nov 2012 03:54:45 +0000 (05:54 +0200)]
moc: Fix assertion in QVector::first()

introduced in aea68c93ae437a761584719f0f1ca93eaf6f7484

Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix color issue with sliders on Fusion style
Jens Bache-Wiig [Sun, 25 Nov 2012 16:10:25 +0000 (08:10 -0800)]
Fix color issue with sliders on Fusion style

We should not directly use the palette as it looks
weird on mac.

Change-Id: I2062bd43a8b28875330d9f8cc0eaa4069f3a43f6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoDoc: Removed annotated list in Qt Core's group pages.
Jerome Pasion [Fri, 23 Nov 2012 15:45:23 +0000 (16:45 +0100)]
Doc: Removed annotated list in Qt Core's group pages.

The annotatedlist commands are not needed as QDoc automatically
generates the group members.

Change-Id: I462bb65bd5f29c1761799d3d60acab0bd4886075
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoQHeaderView: - avoid cursor move on setDefaultSectionSize
Thorbjørn Lund Martsum [Thu, 22 Nov 2012 18:49:05 +0000 (19:49 +0100)]
QHeaderView: - avoid cursor move on setDefaultSectionSize

If we are reacting on the sectionResized signal and we call
setDefaultSectionSize we should ensure that we are not moving
the mouse-cursor.

This is an improvement of f8f6acb05ce9aa5fccc329bf5587adf14ed9a710

Change-Id: I1adee7821bc8fcc9633f692bfd515f2c458b12c8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoImproved tri-state checkbox in Fusion style
Jens Bache-Wiig [Sun, 21 Oct 2012 17:12:20 +0000 (19:12 +0200)]
Improved tri-state checkbox in Fusion style

This changes the tristate checkbox to look more distinct from the
disabled checkbox.

Task-number: QTBUG-27661

Change-Id: If0921c91d27b62552cbcf86563eed1b75e800478
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoUpdate XKB data generator to use correct QLocale names
Konstantin Ritt [Sat, 24 Nov 2012 04:53:34 +0000 (06:53 +0200)]
Update XKB data generator to use correct QLocale names

Change-Id: I55fd5f029d77950a9074d9c86a65499b48806ebe
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoLocaleSelector: Replace hard-coded impl with an algorithmic one
Konstantin Ritt [Sat, 24 Nov 2012 03:20:39 +0000 (05:20 +0200)]
LocaleSelector: Replace hard-coded impl with an algorithmic one

The old implementation is just not acceptable!
The new one is able to distinguigh locales by script.

Change-Id: Ic772f6da8744825080f739e64af00267e5f82434
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoQLocale: Fix matchingLocales() behavior if script or country is not Any*
Konstantin Ritt [Sat, 24 Nov 2012 02:09:34 +0000 (04:09 +0200)]
QLocale: Fix matchingLocales() behavior if script or country is not Any*

Since the documentation doesn't mention the search should be done by language only,
consider the current behavior incorrect.
As of now, it is possible to get a list of locales by Country or Script as well.

Also fix countriesForLanguage() to be in-sync with matchingLocales().

Change-Id: I6a09ca459120143565fa6099d2b823df1fed7c25
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoQtBase: example code style
David Schulz [Fri, 23 Nov 2012 13:27:50 +0000 (14:27 +0100)]
QtBase: example code style

Change-Id: I0685f7e2c7c698a4bf288b8b1ae909167932a3fb
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoQtBase: examples/widgets/richtext code style
David Schulz [Fri, 23 Nov 2012 12:36:40 +0000 (13:36 +0100)]
QtBase: examples/widgets/richtext code style

Change-Id: Ie0c27464e0fdb8f26caf0d8f27043da4ec45f41f
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoFix QVariant streaming in Qt3 compatibility mode.
Jędrzej Nowacki [Wed, 21 Nov 2012 15:24:49 +0000 (16:24 +0100)]
Fix QVariant streaming in Qt3 compatibility mode.

Task-number: QTBUG-27700
Change-Id: I0408293e43c3330dbc4746198a19709e795f552a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agotst_QDateTimeEdit: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 14:27:32 +0000 (15:27 +0100)]
tst_QDateTimeEdit: remove redundant include

Change-Id: I3aeb90723b41b35e221b86b1767ed1ac45a9fe0c
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agotst_QToolButton: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 14:29:04 +0000 (15:29 +0100)]
tst_QToolButton: remove redundant include

Change-Id: Ie55a530a89b85a4f3369ee3205221fb01fa1773e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years ago[SIC] QLocale: Update some language names with their modern values
Konstantin Ritt [Fri, 23 Nov 2012 10:18:11 +0000 (12:18 +0200)]
[SIC] QLocale: Update some language names with their modern values

Some of them were incorrectly spelled (for a while)

Change-Id: I871968e3bbdd2172f4c4dfb6e74729c05e7e8e01
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQLocale: Fix toCurrencyString() didn't respect group separator option
Konstantin Ritt [Fri, 23 Nov 2012 09:45:01 +0000 (11:45 +0200)]
QLocale: Fix toCurrencyString() didn't respect group separator option

Change-Id: Icda43d71d600d77fe1ed4fcde1ef4478ef29c1d5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoCleanup tst_QApplication
J-P Nurmi [Fri, 23 Nov 2012 14:02:46 +0000 (15:02 +0100)]
Cleanup tst_QApplication

Remove redundant includes, remove references to deprecated
QApplication::GuiServer (passing that has no effect anymore), and use
QStyleFactory instead of referencing QWindowStyle directly (about to
become an internal class).

Change-Id: I08f94993a55ce6039c7694d8f7019cbd53594edc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoRemove QApplication::type() and make QCoreApplication::Type internal
J-P Nurmi [Thu, 22 Nov 2012 13:29:07 +0000 (14:29 +0100)]
Remove QApplication::type() and make QCoreApplication::Type internal

These Qt3 legacy application types do not match the application types
available in Qt5. Thus, the decision was to kill the confusing and
mostly useless type enum. Use for example qobject_cast instead to find
out the application type.

Task-number: QTBUG-28093
Change-Id: Ia8cf7c3ea98a3cea27f74760d62e519ea10bce9f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMake skipping of test consistent.
Frederik Gladhorn [Fri, 23 Nov 2012 16:39:23 +0000 (17:39 +0100)]
Make skipping of test consistent.

On Mac every function was skipped individually,
on the other platforms it was marked as
insignificant.

See also QTBUG-22560 and QTBUG-22361

Change-Id: Ie9b9c617006d5a8c19d042b8be89e449c5ac70bc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoDraw disabled QMenu items in inactive state in vista style.
Friedemann Kleint [Fri, 23 Nov 2012 14:18:50 +0000 (15:18 +0100)]
Draw disabled QMenu items in inactive state in vista style.

Task-number: QTBUG-27992

Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoUpdated aboutQt dialog text
Lars Knoll [Fri, 23 Nov 2012 13:48:04 +0000 (14:48 +0100)]
Updated aboutQt dialog text

Updated supported platforms to match reality better,
mention qt-project.org and other copyright holders.

Task-number: QTBUG-25205
Change-Id: I4856d515500945ace55f7fd445b5b138aa00df83
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoRemove Plastique and Cleanlooks from the widget gallery
Jan Arve Saether [Fri, 23 Nov 2012 15:10:17 +0000 (16:10 +0100)]
Remove Plastique and Cleanlooks from the widget gallery

This commit does not remove the actual images, since they
are referenced from many other places.

Plastique style seems to have been used often as a style
for showing a screenshot of a widget (probably because it
has been available on all platforms).

When fusion style gets its gallery with images, the references
to the plastique images should probably be replaced with
references to fusion images.

Change-Id: I288c06df2c5e1f3a212b873ec0f087e119b895b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Be consistent, and put all widget classes in the same page.
Jan Arve Saether [Fri, 23 Nov 2012 08:58:30 +0000 (09:58 +0100)]
Doc: Be consistent, and put all widget classes in the same page.

Change-Id: I152a39e798a152b5362db7fdc63ccd6b887ee13b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix outdated comment in kernel/qtranslator_p.h.
hjk [Fri, 23 Nov 2012 07:12:22 +0000 (08:12 +0100)]
Fix outdated comment in kernel/qtranslator_p.h.

Change-Id: I0e7cc1686c5bcce611e353987e41b4dae7af5c31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agodocs: DBus: Remove ObjectTree
Frederik Gladhorn [Fri, 23 Nov 2012 15:07:29 +0000 (16:07 +0100)]
docs: DBus: Remove ObjectTree

In 0696071316b3dacb8d1ca15a269e4f4215642b9d
the ObjectTree class was removed.

Change-Id: I9c7a505a597e7c2ed9243468faee931a481b1b22
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodocs: Remove doc for removed functions
Frederik Gladhorn [Fri, 23 Nov 2012 14:27:52 +0000 (15:27 +0100)]
docs: Remove doc for removed functions

In 3986b5127419dfd6db6ce667b2976d188e25d9be
these two functions were removed.

Change-Id: Ib38692099aee8f71a8ae0f7949b8fa90eddf6009
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodocs: Link to class overview for dbus
Frederik Gladhorn [Thu, 22 Nov 2012 14:52:22 +0000 (15:52 +0100)]
docs: Link to class overview for dbus

Change-Id: I15b3791861e393065817054965aec5c0a5ae4c7b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix selection in QTableView when rows and columns have been moved
Miikka Heikkinen [Thu, 15 Nov 2012 11:08:12 +0000 (13:08 +0200)]
Fix selection in QTableView when rows and columns have been moved

The determination of top left and bottom right model indexes for the
selection used logical indexes, which resulted in selection truncating
itself if the first or last row or column had been moved to different
position on the table. Changed the logic to use visual indexes instead.

Task-number: QTBUG-28009
Change-Id: I4eb9dab690dafda9d2ab7c452dd6271fad70cb30
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoAdded reference to W3C's XML specs
Nico Vertriest [Wed, 21 Nov 2012 14:34:13 +0000 (15:34 +0100)]
Added reference to W3C's XML specs

Removed 's from title

Change-Id: I7c44279aab02edd26e454da5f59f4a9a19eab18a
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoPrevent "number of sections exceeded" when compiling qmetatype tests.
Mitch Curtis [Thu, 22 Nov 2012 11:45:30 +0000 (12:45 +0100)]
Prevent "number of sections exceeded" when compiling qmetatype tests.

When compiling qmetatype auto tests with msvc2008 64-bit, I receive:

qmetatype.h(383) : fatal error C1128: number of sections exceeded
object file format limit : compile with /bigobj

This patch follows that advice and adds /bigobj to QMAKE_CXXFLAGS.

Change-Id: I05b3cf9dfdb6a93649c692e2df22365d200e6f2f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoFixed excessive enter/leave events being generated with the xcb plugin.
Samuel Rødal [Fri, 23 Nov 2012 14:10:39 +0000 (15:10 +0100)]
Fixed excessive enter/leave events being generated with the xcb plugin.

When we get a leave event we peek ahead in the queue to see if there's
an enter event already pending. If so we use
QWindowSystemInterface::handleEnterLeave() instead of two separate
window system interface events, so that you don't get leave and enter
events for the whole parent chain when moving the mouse cursor between
two neighbouring native child widgets.

We skip VIRTUAL events as they are generated for parent windows, and we
only care about the bottom-most window that is being entered / left. Qt
can take care of the rest since it knows the QWindow hierarchy.

We need to not skip leave events with detail set to INFERIOR, since Qt
expects to get a handleEnterLeave() when the mouse moves from a parent
window to a child window.

Task-number: QTBUG-27550
Change-Id: I7457d2e59d8b694081f2e43a16cd2e58d769624e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDo not detect directories ending in ".lnk" as link files.
Friedemann Kleint [Fri, 23 Nov 2012 13:54:18 +0000 (14:54 +0100)]
Do not detect directories ending in ".lnk" as link files.

Task-number: QTBUG-21863

Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoProper macro replacment and branch evaluation
Lars Knoll [Thu, 22 Nov 2012 10:03:39 +0000 (11:03 +0100)]
Proper macro replacment and branch evaluation

Correclty replace macros according to the C++ standard.
Use the correct replacement method also to evaluate

With this moc correctly processes boost headers.

Task-number: QTBUG-27546

Change-Id: I001b3054c5fcdc34d46cfa53d1387bd19436f361
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoCorrectly expand arguments in function macros
Lars Knoll [Thu, 22 Nov 2012 09:31:14 +0000 (10:31 +0100)]
Correctly expand arguments in function macros

Arguments in function macros are only expanded if they
aren't used in conjunction with a # or ## operator.

Change-Id: I8c80e11902a592128504c4637545e75866566965
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoRemove additional whitespaces from the macro tokens
Lars Knoll [Thu, 22 Nov 2012 08:13:14 +0000 (09:13 +0100)]
Remove additional whitespaces from the macro tokens

According to the spec, we should ignore whitespace tokens
at the beginning and end of the macro definition. In addition,
whitespaces after a # and around ## should be ignored

Change-Id: I830d0f4aaed3bcfac345d7da6df65693ec3315b8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoEmit destroyed() signal before children get deleted
Lars Knoll [Tue, 20 Nov 2012 12:34:06 +0000 (13:34 +0100)]
Emit destroyed() signal before children get deleted

Make sure we always emit the destroyed() signal before
we delete our children. This wasn't working correctly
for QWidget based classes, as the QWidget destructor
deletes all children itself.

Task-number: QTBUG-24672
Change-Id: Iecdff3489196271177edfeba1c4a2c5800e255af
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoAdd VS manifest files to .gitignore
J-P Nurmi [Fri, 23 Nov 2012 12:24:46 +0000 (13:24 +0100)]
Add VS manifest files to .gitignore

Change-Id: I3aea869d870bdba047b4e86d2034c25eb62075f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoCleanup Symbian specific rules from .gitignore
J-P Nurmi [Fri, 23 Nov 2012 12:21:00 +0000 (13:21 +0100)]
Cleanup Symbian specific rules from .gitignore

Change-Id: I0a47ae19d327af54e54cca94a04d90b543855988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix \brief for QEasingCurve
Lars Knoll [Fri, 23 Nov 2012 13:25:23 +0000 (14:25 +0100)]
Fix \brief for QEasingCurve

Change-Id: Ibb8ce4e87e6338cc9d436344d1336397db093cb0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQHeaderView - Fix auto-scroll on manual move on sections
Thorbjørn Lund Martsum [Wed, 31 Oct 2012 15:01:53 +0000 (16:01 +0100)]
QHeaderView - Fix auto-scroll on manual move on sections

This patch fixes the manual move of sections when auto scroll is on.
It is done in QAbstractItemView::doAutoScroll by letting the
qheaderView use its parents scrollbars if they are childs of a
QTableView or QTreeView.

Task-number: QTBUG-993
Task-number: QTBUG-1103

Change-Id: I70d999d9a07c3566e42d01cc5ebb47a69a83d9d4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoQAbstractItemView - prepare fix for auto scroll on sectionmove
Thorbjørn Lund Martsum [Wed, 31 Oct 2012 14:07:40 +0000 (15:07 +0100)]
QAbstractItemView - prepare fix for auto scroll on sectionmove

There are no semantic changes in this patch. We just avoid
many calls to horizontalScrollBar() and verticalScrollBar() by
storing the result of them in local variables, that are used
instead.

This is just a prepare for auto-scroll when a user is moving a
section.

Change-Id: I4b3d3ecbf3a29992e6f578d4b0442d7f494125e4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoPrevent easing example warnings.
Thomas Hartmann [Wed, 21 Nov 2012 10:53:45 +0000 (11:53 +0100)]
Prevent easing example warnings.

examples/widgets/animation/easing was spitting out a lot of
"QEasingCurve: Invalid tcb curve" warnings.
The reason was that in case of the TCP curve we do not provide
defaults.

The function createEasingCurve() now provides reasonable values
for the custom curves to show what is possible and how to use them.

Change-Id: I880d8d0f0ce2872ce2019f7d2e000f4c4ce136e2
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
11 years agoCocoa: Make sure non windowed QCocoaWindows hide their content views
Gabriel de Dietrich [Thu, 22 Nov 2012 16:38:52 +0000 (17:38 +0100)]
Cocoa: Make sure non windowed QCocoaWindows hide their content views

Change-Id: I92b8600c513ba033c459b6911ca62fc31698dc4a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoCocoa: Make sure child windows' QNSView is properly released
Gabriel de Dietrich [Wed, 21 Nov 2012 15:19:21 +0000 (16:19 +0100)]
Cocoa: Make sure child windows' QNSView is properly released

Child QCocoaWindows don't have an assigned NSWindow, but still get a
QNSView as backing store. That QNSView is added as a subview to
the parent window's QNSView. That would leave an unmanaged QNSView
alive.

Change-Id: I10f57fb971f7aa1e278bb0af4217052d1e4bb0bc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoCocoa: QGLWidget draws wrong within QMainWindow on Mac OS
Richard Moe Gustavsen [Wed, 21 Nov 2012 12:57:00 +0000 (13:57 +0100)]
Cocoa: QGLWidget draws wrong within QMainWindow on Mac OS

The resons for this bug is that Qt can share the same backingstore
between several windows (if they exist in the same hierarchy), but
this was just not supported by the Cocoa plugin.

This patch will make sure that we pay attention to which window
the QCocoaBackingStore is told to flush, and forward this information
to the QNSView that backs it up. Inside the views drawRect
function we then take some extra steps to get the correct sub-part
of the possibly shared backingstore image.

This patch also does some effort to ensure that we recreate the
backingstore image as little as possible, as we can often get
several resizes to the backingstore before we actually draw anything.
Moreover, by being a bit careful on how we tell UiKit to update
the view upon a flush, we can minimize the number of drawRect calls
(and then CGImageRef creations) we need to do. This patch actually
ends up improving resize/repaint performance a lot as well.

QT-BUG: 27390
Change-Id: I2c2a26b149fa855411b6bff8b9cc9a61694ae72f
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoMake widgetgrab manual test compile with 4.8 and 5.
Friedemann Kleint [Fri, 23 Nov 2012 11:42:11 +0000 (12:42 +0100)]
Make widgetgrab manual test compile with 4.8 and 5.

Task-number: QTBUG-27333
Task-number: QTBUG-27550

Change-Id: Iceb2ded9deff1d375bf02b88e214da20901bfa0e
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
11 years agoQtBase: examples/widgets/graphicsview/ codestyle
David Schulz [Fri, 23 Nov 2012 08:31:03 +0000 (09:31 +0100)]
QtBase: examples/widgets/graphicsview/ codestyle

Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoQtBase: examples/widgets/painting code style
David Schulz [Fri, 23 Nov 2012 10:52:51 +0000 (11:52 +0100)]
QtBase: examples/widgets/painting code style

Change-Id: I3d3c6f3bae20ac8383279437f8f89c92195a704f
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAdd nsOpenGLContextForContext to QCocoaNativeInterface.
Zeno Albisser [Fri, 23 Nov 2012 09:52:22 +0000 (10:52 +0100)]
Add nsOpenGLContextForContext to QCocoaNativeInterface.

This change enables receiving the native NSOpenGLContext that is used
by a QOpenGLContext. This clearly is non-public api that is only meant to
be used as a last resort for cases where it is really necessary to
get hold of a native context object.

Change-Id: Iea7c6abb458acc7aa15926052673270d25d1d9d1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix race condition on d->state, by locking the mutex first.
David Faure [Tue, 23 Oct 2012 20:25:10 +0000 (22:25 +0200)]
Fix race condition on d->state, by locking the mutex first.

Detected by helgrind ./tst_qurl testThreads

Change-Id: I0fe01153cd119741ce8a2bfe7dddead7c6ebf0b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoMade QMacStyle internal
J-P Nurmi [Fri, 16 Nov 2012 23:52:26 +0000 (00:52 +0100)]
Made QMacStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QMacStyle directly.

Change-Id: I44a2f5ee3fe08ecc837b593a2a2737eb90e8c267
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agotst_qlistview: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 13:54:26 +0000 (14:54 +0100)]
tst_qlistview: remove redundant include

Change-Id: If33518159feb202fa041ac2809817dff5616249f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agotst_qwizard: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 13:51:26 +0000 (14:51 +0100)]
tst_qwizard: remove redundant include

Change-Id: I837aed1e5e601e67105562df2764327b7e8c44a6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoxcb plugin: Move the include XInput2.h statements
Thomas Senyk [Thu, 22 Nov 2012 17:11:56 +0000 (18:11 +0100)]
xcb plugin: Move the include XInput2.h statements

If the include of egl.h does nasty things with X11-defines
(this happens with the imx6 gpu-drivers) errors are avoided if
the include of XInput2.h is next to the other X-includes,
and not after include of egl.h

Change-Id: I182d0e1fcf3fa3e6abce880d34e63cc1d2ce8ed4
Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>