profile/ivi/qtbase.git
12 years agoQTestLib-selftest: Unblock on Windows.
Friedemann Kleint [Thu, 22 Dec 2011 14:01:40 +0000 (15:01 +0100)]
QTestLib-selftest: Unblock on Windows.

Do not run tests that pop up assert boxes.

Change-Id: Idac94398ff1109605eb33a042dab734eafb1a17a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoAllow QMetaType to register information about movability
Jędrzej Nowacki [Tue, 13 Dec 2011 11:07:47 +0000 (12:07 +0100)]
Allow QMetaType to register information about movability

We need that information to perform some optimizations in QVariant.

Change-Id: Id9a1716e49e4cedd17cd09a32fea4ff003ef61f2
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoRemove QT_NO_STL_WCHAR hack
Harald Fernengel [Wed, 21 Dec 2011 09:40:36 +0000 (10:40 +0100)]
Remove QT_NO_STL_WCHAR hack

We don't support gcc 2.95 any more.

Change-Id: I842f1f8ac64b9006516c104add0991830ac9a46a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix handling of invalid modifiers in QKeySequence.
David Faure [Wed, 21 Dec 2011 19:15:25 +0000 (20:15 +0100)]
Fix handling of invalid modifiers in QKeySequence.

When decoding a string don't assume valid modifier strings. If a
modifier string is unknown return Qt::Key_unknown instead of skipping
the modifier.
Currently 'Win+a' is decoded to 'A' but should be Qt::Key_unknown.

Change-Id: I1c82031159a8b3c19924a7c9e991bc6b1f90d617
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoUse strlen() inline whenever possible
Harald Fernengel [Wed, 21 Dec 2011 11:03:08 +0000 (12:03 +0100)]
Use strlen() inline whenever possible

This allows us to benefit from compile-time optimization

Change-Id: I63dfde3758fcb0ff919fdc0418df1b7586da0b2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoEnable Mac style on Mac OS X.
Morten Johan Sorvig [Wed, 14 Dec 2011 14:11:49 +0000 (15:11 +0100)]
Enable Mac style on Mac OS X.

Add styles/qmacstyle_mac back to the build, modify
qstylefactory to load it on Q_OS_MAC.

Move helper functions from platforms/mac to
qmacstyle_mac.mm. QMacStyle should now be self-
contained and not rely on anything from platforms/mac.

Change-Id: I68fe40bb7f88c01269968bffd9579b7f3b932d4c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQNetworkAccessManager: fixed foreach copy of host address
Martin Petersson [Thu, 22 Dec 2011 09:53:19 +0000 (10:53 +0100)]
QNetworkAccessManager: fixed foreach copy of host address

Change-Id: I50cb113fb3c803fc5b13c74b3f7ad1fc4283065b
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoAdd ToS option to sockets.
Jonas M. Gastal [Tue, 20 Dec 2011 16:42:06 +0000 (14:42 -0200)]
Add ToS option to sockets.

Creates a new SocketOption called called TypeOfServiceOption that can be
used with the existing setSocketOption method to set the ToS byte in a
socket socket. This is done only for unix systems because windows
doesn't support directly setting the ToS/DSCP byte:
http://support.microsoft.com/kb/248611
http://blogs.msdn.com/b/wndp/archive/2006/07/05/657196.aspx

Change-Id: Idf9da2dd8307ac7057982fbfdf9e4e9ebe366780
Task-number: QTBUG-6221
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoSSL: fix build with -openssl-linked for OpenSSL 0.9.8*
Peter Hartmann [Mon, 19 Dec 2011 10:46:45 +0000 (11:46 +0100)]
SSL: fix build with -openssl-linked for OpenSSL 0.9.8*

OpenSSL's SSL_ctrl() always took a "void *" argument as 4th parameter,
since at least version 0.9.7.
I have no idea why we had "const void *" in there.

Reviewed-by: Richard J. Moore <rich@kde.org>
Task-number: QTBUG-23132
(cherry picked from commit 4db91cbd6147e40f543342f22c05b7baddc52e5a)

Change-Id: Ie570e1cc59b72f13d3e6f3ed6fc1892444a63743
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoDisable logging in xcb
Jørgen Lind [Thu, 22 Dec 2011 08:46:07 +0000 (09:46 +0100)]
Disable logging in xcb

The logging groves and modifies a vector.. It should at least be a
linked-list. but anyway, it shouldn't be enabled by default

Change-Id: Iaebb1158eea1c907e31e9606b143c0318a189dd1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoTest case for QTBUG-22875
Shane Kearns [Tue, 13 Dec 2011 15:50:59 +0000 (15:50 +0000)]
Test case for QTBUG-22875

Test the authentication cache works properly with "cancelled dialogs"
or if the user enters username/password incorrectly.
Expected behaviour is based on web browsers:
If cancelled, current request fails, and prompt again the next time.
If wrong password is given, prompt again and retry the current request.
If bad credentials are in the cache, prompt again

Task-number: QTBUG-22875
Change-Id: Ic02ccac8dbeb3f2580ca4ffe47d0773982c4ab25
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoFix compile error when configured with -no-exceptions
Shane Kearns [Mon, 12 Dec 2011 16:24:52 +0000 (16:24 +0000)]
Fix compile error when configured with -no-exceptions

The test was skipped, but still tried to compile code that uses
exceptions. The throwing class it uses was conditionally compiled
out earlier in the file, causing an error for undefined class.

Task-number: QTBUG-23028
Change-Id: Ia2e05a8a0abbf0e913f6c41e85bfee8b85cbc8a5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoMac: Add temporary solution to fix app deployment.
Morten Johan Sorvig [Tue, 6 Dec 2011 20:09:53 +0000 (21:09 +0100)]
Mac: Add temporary solution to fix app deployment.

Look for the the platform plugin in "../Plugins" first.
When deployed inside an app bundle this path will
point to the plugin directory inside the app bundle.

Change-Id: I362981a9e0ca9a3e69396b033a571d0b4e2bf78a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix up the accessibility inspector.
Morten Johan Sorvig [Tue, 20 Dec 2011 12:20:13 +0000 (13:20 +0100)]
Fix up the accessibility inspector.

After accessibility API changes. Also make the windows
a bit smaller since the primary user is on a laptop
now.

Change-Id: I53a86cbe85adbbb27401dbf6c3c389629e295b4d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoDo not crash in the windows accessibility bridge
Jan-Arve Saether [Tue, 20 Dec 2011 12:32:01 +0000 (13:32 +0100)]
Do not crash in the windows accessibility bridge

If the object did not have a QAccessibleInterface subclass it would
crash in the windows accessibility bridge.

Change-Id: I931d69466a5a74a87f1c1c577fb1c918dcc8accf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoQNetworkAccessManager: delay IPv4 or IPv6 based on getaddrinfo order
Martin Petersson [Mon, 19 Dec 2011 10:02:46 +0000 (11:02 +0100)]
QNetworkAccessManager: delay IPv4 or IPv6 based on getaddrinfo order

Instead of always delaying IPv4 when we have both Ipv4 and IPv6 we
should use the order we get from getaddrinfo to descide which one
that should be delayed.

Task-number: QTBUG-23066
Change-Id: Ibe8c4d7000abd6e57fe8c6afac8a4a843e17ff27
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoQTestlib: Make QImage comparison more verbose.
Friedemann Kleint [Mon, 19 Dec 2011 10:33:07 +0000 (11:33 +0100)]
QTestlib: Make QImage comparison more verbose.

Introduce a specialization for qCompare(QImage,QImage) that
checks isNull, size and format and outputs verbose messages.

Check isNull, size similarly for QPixmap.

Add an autotest:
- Add test to cmptest and make it a GUI application since
  QImage requires QGuiApplication.
- Make testlib/selftests capable of running X11-GUI applications
  by passing DISPLAY.
- Ignore stderr output for cmptest
- Add test data

Change-Id: I2b29c7822fbeedf2b22c90889739ed7ff859ce92
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQTestLib: Fix QFINDTESTDATA for Windows.
Friedemann Kleint [Tue, 20 Dec 2011 08:43:24 +0000 (09:43 +0100)]
QTestLib: Fix QFINDTESTDATA for Windows.

- Scan the parent directory of the executable if it is located
  in a 'Debug' or 'Release' directory
- Report with native separators in the log.
- Use the QString::arg() overloads with several string parameters.

Change-Id: I5ea84411e12978f8f958a0bce3ae10da44cc4e3f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRebuild configure.exe.
Friedemann Kleint [Wed, 21 Dec 2011 13:14:27 +0000 (14:14 +0100)]
Rebuild configure.exe.

- Use create_prl, link_prl for all modules.
- Remove -graphicssystem (and -runtimegraphicssystem) options from
  configure.

Change-Id: Id1e0c8f82fa3149fd67c6a31e9e8baec06366205
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoconfigure[.exe]: use create_prl, link_prl for all modules
Rohan McGovern [Wed, 14 Dec 2011 01:33:15 +0000 (11:33 +1000)]
configure[.exe]: use create_prl, link_prl for all modules

These should go into qmodule.pri, rather than .qmake.cache, as they
make sense for all Qt modules - not only qtbase.

Fixes link failure when building qtdeclarative with jom on Windows.

Change-Id: I3e8b207e1808cb23af58b865a160c2fafa906288
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoReimplement QIODevice::reset() properly
Bradley T. Hughes [Tue, 20 Dec 2011 08:18:56 +0000 (09:18 +0100)]
Reimplement QIODevice::reset() properly

The reset() function is not const.

tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp:324:
warning: 'FixedSizeDataGenerator::reset' hides overloaded virtual
function [-Woverloaded-virtual]
    virtual bool reset() const{
                 ^
src/corelib/io/qiodevice.h:112: hidden overloaded virtual function
'QIODevice::reset' declared here
    virtual bool reset();
                 ^

Change-Id: I022d902147f9c8fb71bee8c3e21b963b2d7bec55
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoReimplement QGraphicsEffect::sourceChanged() properly
Bradley T. Hughes [Tue, 20 Dec 2011 08:26:30 +0000 (09:26 +0100)]
Reimplement QGraphicsEffect::sourceChanged() properly

sourceChanged() takes one argument, not zero.

tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp:125:
warning: 'CustomEffect::sourceChanged' hides overloaded virtual function
[-Woverloaded-virtual]
    void sourceChanged()
         ^
src/widgets/effects/qgraphicseffect.h:104:
hidden overloaded virtual function 'QGraphicsEffect::sourceChanged'
declared here
    virtual void sourceChanged(ChangeFlags flags);
                 ^

Change-Id: If227b7b79c4a2fc3d21f93e371510ddccb408d7d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoReimplement QVariantAnimation::updateState() properly
Bradley T. Hughes [Tue, 20 Dec 2011 08:22:20 +0000 (09:22 +0100)]
Reimplement QVariantAnimation::updateState() properly

The updateState() takes 2 arguments, not 1.

tests/benchmarks/gui/animation/qanimation/dummyanimation.h:54: warning:
'DummyAnimation::updateState' hides overloaded virtual function
[-Woverloaded-virtual]
    void updateState(State state);
         ^
src/corelib/animation/qvariantanimation.h:106: hidden overloaded virtual
function 'QVariantAnimation::updateState' declared here
    void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
         ^

Change-Id: Ieb2e4e0b1f017c51c4fed5bdb874ba30cb056916
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoReimplement QAbstractFileEngine::open() properly
Bradley T. Hughes [Tue, 20 Dec 2011 08:16:54 +0000 (09:16 +0100)]
Reimplement QAbstractFileEngine::open() properly

The virtual function takes a QIODevice::OpenMode argument, not an int.

tests/auto/corelib/io/qfile/test/../tst_qfile.cpp:1942: warning:
'MyEngine::open' hides overloaded virtual function [-Woverloaded-
virtual]
    bool open(int ) { return false; }
         ^
src/corelib/io/qabstractfileengine.h:118: hidden overloaded virtual
function 'QAbstractFileEngine::open' declared here
    virtual bool open(QIODevice::OpenMode openMode);
                 ^

Change-Id: I92338dacb89c05d8c5cfbf8ce094dc519b84d3ba
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoConvert macros to functions.
Stephen Kelly [Mon, 19 Dec 2011 21:30:50 +0000 (22:30 +0100)]
Convert macros to functions.

Change-Id: I43f4188d1c33cd5a07eb7a12bf3343af7e6a211f
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoPort to list(APPEND)
Stephen Kelly [Mon, 19 Dec 2011 21:27:48 +0000 (22:27 +0100)]
Port to list(APPEND)

Change-Id: I198622270324eea62dd5ad6343fdf7c89e736e6c
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove misleading and incorrect information from dropMimeData docs.
Stephen Kelly [Mon, 12 Dec 2011 14:29:32 +0000 (15:29 +0100)]
Remove misleading and incorrect information from dropMimeData docs.

It is not the responsibility of the view to insert data into the
model after a dropMimeData call.

Change-Id: Ib2dedddb3239af0e2bf722a28081c68677e6b2af
Reviewed-by: David Faure <faure@kde.org>
12 years agoFix style in cmake macros files.
Stephen Kelly [Mon, 19 Dec 2011 21:17:02 +0000 (22:17 +0100)]
Fix style in cmake macros files.

Change-Id: I2806ce63f5948dde9c582740bc2f070900987fb5
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoConnect to the moved signals in the header view.
Stephen Kelly [Thu, 15 Dec 2011 14:35:59 +0000 (15:35 +0100)]
Connect to the moved signals in the header view.

Change-Id: I6954f77ad7d02970f562abcbaf4e733c6d43ead5
Reviewed-by: David Faure <faure@kde.org>
12 years agoFix whitespace consistency.
Stephen Kelly [Thu, 15 Dec 2011 14:35:40 +0000 (15:35 +0100)]
Fix whitespace consistency.

Change-Id: Ia5debce8e5be4e9c67e1ef303e136816ab55bf90
Reviewed-by: David Faure <faure@kde.org>
12 years agoFix -tickcounter in qtestlib.
Robin Burchell [Fri, 16 Dec 2011 17:32:46 +0000 (18:32 +0100)]
Fix -tickcounter in qtestlib.

HAVE_TICK_COUNTER is supposed to be set (if possible) from cycle_p.h, so
guarding cycle_p.h's inclusion with HAVE_TICK_COUNTER ensures it will never be
set.

Change-Id: I6313d0a2efd47c89522623e8e7b3f505489ded90
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove mention of Trolltech in installation path.
Jason McDonald [Tue, 20 Dec 2011 06:44:19 +0000 (16:44 +1000)]
Remove mention of Trolltech in installation path.

Task-number: QTBUG-19653

Change-Id: Ic92e0bb4980af53568efe77ebc72e048ee5a32d7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMerge QReadWriteLock constructor overloads per Qt 5 comment.
Robin Burchell [Tue, 20 Dec 2011 17:28:49 +0000 (18:28 +0100)]
Merge QReadWriteLock constructor overloads per Qt 5 comment.

Change-Id: I3b569b1240a0bc5b2589de353dbf62c175472448
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd missing connections.
Stephen Kelly [Mon, 19 Dec 2011 19:32:06 +0000 (20:32 +0100)]
Add missing connections.

Unit tested in next commit.

Change-Id: Iab37829f98ef8f2258a30aed60e95aa114379b7e
Reviewed-by: David Faure <faure@kde.org>
12 years agoRemove unused QPicture::detach_helper() private method.
Robin Burchell [Tue, 20 Dec 2011 11:30:04 +0000 (12:30 +0100)]
Remove unused QPicture::detach_helper() private method.

QPicture doesn't need this for quite a long time now, so get rid of it.

Change-Id: Ie575f32555deb130f7b27e11a7617fb2b3dc4e43
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoRemove non-const QMovie::cacheMode().
Robin Burchell [Tue, 20 Dec 2011 11:36:16 +0000 (12:36 +0100)]
Remove non-const QMovie::cacheMode().

There's a const QMovie::cacheMode(), so having this makes no sense.

Change-Id: I0b6f20055fcbb28f3a21a8bc303f82543592c9c6
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agomake QString::fromLatin1 partially inline
Harald Fernengel [Tue, 20 Dec 2011 12:42:17 +0000 (13:42 +0100)]
make QString::fromLatin1 partially inline

This allows us to benefit from compile time optimizations when calling
strlen()

Change-Id: If6694117e613a012fce97f8664e6b43005d255de
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agofixqt4headers: Add QtCore to folders (for moved item models).
Friedemann Kleint [Tue, 20 Dec 2011 14:13:51 +0000 (15:13 +0100)]
fixqt4headers: Add QtCore to folders (for moved item models).

Change-Id: I71f805c618a888e654207fb29f68769f9d90db9b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove unused qInitResourceIO() method.
Robin Burchell [Tue, 20 Dec 2011 11:09:29 +0000 (12:09 +0100)]
Remove unused qInitResourceIO() method.

Was effectively removed in 4.x's 2e7d5def1fdabb5949fbffc629da500aa2bb78d7, but
couldn't be removed due to it being exported.

Change-Id: I5061f50deaeae7f53e8b688633e377095b4463c2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove qt_image_id() and qt_image_colortable().
Robin Burchell [Tue, 20 Dec 2011 11:53:32 +0000 (12:53 +0100)]
Remove qt_image_id() and qt_image_colortable().

Both of these have been unused at least as far back as Qt 4.5 according to git
log -p.

Change-Id: I381024cb1621fbfdb806a62e1cc55ce13219ef17
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoAdapt from input context mousehandler to input panel in QLineEdit
Pekka Vuorela [Thu, 15 Dec 2011 12:42:07 +0000 (14:42 +0200)]
Adapt from input context mousehandler to input panel in QLineEdit

Change-Id: If14d0cc18188da1dbc8b152fa2fa9583ff03b3bc
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemove input context action support from editors
Pekka Vuorela [Thu, 15 Dec 2011 13:19:35 +0000 (15:19 +0200)]
Remove input context action support from editors

Relying on obsolete QInputContext API.

Change-Id: I954ccf57204cbb24ff5cec622384fa3b9932a079
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemove QInputContext based test from QGraphicsItem tests
Pekka Vuorela [Thu, 15 Dec 2011 14:06:27 +0000 (16:06 +0200)]
Remove QInputContext based test from QGraphicsItem tests

Was basically checking that a method call is a method call and
QApplication::setInputContext() sets the input context.

Change-Id: Ia8723fe245f2480d503f0140f61078dc074161fc
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemoved test for obsolete QInputContext
Pekka Vuorela [Thu, 15 Dec 2011 15:00:53 +0000 (17:00 +0200)]
Removed test for obsolete QInputContext

Change-Id: Idb3b909934434f8f55eb6e94aa814840ab628856
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoAdapt from QInputContext interface to QInputPanel
Pekka Vuorela [Thu, 15 Dec 2011 13:11:55 +0000 (15:11 +0200)]
Adapt from QInputContext interface to QInputPanel

Change-Id: I4143c3b516e7b0e46c706b8a6560bca9d8951572
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoAdd destructor to QPlatformFontDatabase.
Frederik Gladhorn [Thu, 15 Dec 2011 12:51:29 +0000 (13:51 +0100)]
Add destructor to QPlatformFontDatabase.

Virtual functions deserve a virtual dtor.

Change-Id: I71b7ae3b7fb0aa1553a37a90dce6270740d49e32
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRevert "Revert "Add QObject::objectNameChanged(con... signal""
Alan Alpert [Tue, 20 Dec 2011 07:23:31 +0000 (17:23 +1000)]
Revert "Revert "Add QObject::objectNameChanged(con... signal""

This reverts commit 9b17557f3bbd5135651bcedf9f10e61d7e078ae2.

Justification: Temporary commit, see JIRA task.
Task-number: QTBUG-22985
Change-Id: I3df9eb5fdbdc133349dca5e192dcfcc9e758626c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoBetter error reporting in case of connection failure.
Olivier Goffart [Mon, 19 Dec 2011 12:10:40 +0000 (13:10 +0100)]
Better error reporting in case of connection failure.

Use Q_STATIC_ASSERT_X give a better error message.
If C++11 is used, you get the string in the error.
Else, clicking on the QStaticFailure error still shows you the
string in the qobject.h source code)

And report better failure if the return types do not match.
(Without the static assert, you would still have a compilation error,
but in an unrelated place, with no reference to the actual connect()
call. The error was thrown from the virtual call
QSlotObject::call, without saying where it was instantiated)

Previously the error was relying on the existence of a type inside
CheckCompatibleArguments, but the Q_STATIC_ASSERT requires a bool
(hence the introduction of CheckCompatibleArguments::value)

There also was a typo in the return value of
AreArgumentsCompatible::dummy that made that code not work, and that
error not be reported.
(Instead, the error was reported when QObjectSlot::call is instantiated)

Specialization of AreArgumentsCompatible for the void type have been
added because if the return value of a signal or slot is void, the
connection should work.

Change-Id: I5a93ec787ce2a4b94a26630ca31d5001cd294e4d
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRetire QTest::pixmapsAreEqual().
Jason McDonald [Mon, 19 Dec 2011 05:22:51 +0000 (15:22 +1000)]
Retire QTest::pixmapsAreEqual().

QTest::pixmapsAreEqual() was left in the Qt4 API for compatibility with
some old tests written for Qt3.  QCOMPARE() is the preferred way to
compare QPixmaps and provides superior diagnostic output when a
comparison fails.

This commit removes QTest::pixmapsAreEqual() from the testlib API and
replaces the last few remaining calls with QCOMPARE.

Change-Id: I051c0e7d3bda072855fcd262d82e8e540619233b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove declaration which is exported from QtGui.
Stephen Kelly [Fri, 16 Dec 2011 23:44:58 +0000 (00:44 +0100)]
Remove declaration which is exported from QtGui.

Fixes static build.

Change-Id: I6f82ded7bf6cb3b72b0ef987e781c7e8f9ed932b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix QDir::removeRecursively so it doesn't follow symlinks to directories.
David Faure [Mon, 19 Dec 2011 19:44:45 +0000 (20:44 +0100)]
Fix QDir::removeRecursively so it doesn't follow symlinks to directories.

Critical bug... Good thing I had backups of my $HOME.

Change-Id: I43b3a80786c946b0aec797036c1164d436d521f8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix QNetworkReply test cases that use the MiniHttpServer on windows
Shane Kearns [Mon, 19 Dec 2011 16:52:59 +0000 (16:52 +0000)]
Fix QNetworkReply test cases that use the MiniHttpServer on windows

The "happy eyeballs" connection code means that IPv4 and IPv6 connections
are both attempted for a http request.
For a normal http server, this is no problem, but the MiniHttpServer in
the test code is very simplistic and cannot cope with more than one
client connected at the same time.
On windows this causes all these tests to fail with timeouts.
Changed the MiniHttpServer to listen on IPv4 only instead of Any address.

Change-Id: I81e249997d894d266001da474a351b1f5642599e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix regression in user-agent setting of http proxy in a QNetworkRequest
Shane Kearns [Mon, 19 Dec 2011 16:49:07 +0000 (16:49 +0000)]
Fix regression in user-agent setting of http proxy in a QNetworkRequest

Modifying the proxy causes a detach(), so the socket is still using
the unmodified proxy.
Changed this to setProxy() the modified one back to the socket.

Test case tst_QNetworkReply::httpProxyCommands()

Change-Id: I448c2f2ab43ce8d78bc6edb8261599bf67372676
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUpdate the touchscreen plug-in.
Laszlo Agocs [Sat, 17 Dec 2011 19:15:50 +0000 (21:15 +0200)]
Update the touchscreen plug-in.

Now works with bcm5974: Added manual contact tracking for drivers that
do not report a tracking id and fixed abs limit querying to use
ABS_MT_* instead of ABS_*.

Fixed reported area: The incoming point was the top-left point instead
of the center which was incorrect.

Added pressure support.

Tracking of event type has been removed as handleTouchEvent no longer
needs it.

Broken debug prints have been removed.

Changed udev auto-detection to pick only /dev/input/event*.

Fixed multiple released state reports with some drivers.

Name and capabilities are now set properly for the QTouchDevice.

Change-Id: I8f026c9a14465bfb6d567f4dcf36c5c03f843868
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDo not call QueuedConnection slot on partialy destroyed object
Olivier Goffart [Thu, 15 Dec 2011 06:24:49 +0000 (07:24 +0100)]
Do not call QueuedConnection slot on partialy destroyed object

This is a regression introduced in Qt 4.8
When QApplication::processEvents is called from a destructor, it is
possible that pending events would still be called on the already
destroyed subclass.
Prevent that by using the same pattern as in QMetaObject::activate

Change-Id: Ida50db07ae089264402dafcde7a41a066479d08b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: Remove Window from list before calling DestroyWindow.
Friedemann Kleint [Mon, 19 Dec 2011 11:05:59 +0000 (12:05 +0100)]
Windows: Remove Window from list before calling DestroyWindow.

Change-Id: Ifef99d9e4e46f0450cecf8ecba18ce79ebec3e8d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQ_STATIC_ASSERT: fix C style cast
Olivier Goffart [Thu, 15 Dec 2011 11:39:40 +0000 (12:39 +0100)]
Q_STATIC_ASSERT: fix C style cast

Else tst_moc::oldStyleCasts will fail if one add STATIC_ASSERT in
some headers included by moc generated files

Change-Id: I29ae64c14f10c889137fde36bb14c8ce047d5244
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoAccessibility: childAt returns interface
Frederik Gladhorn [Tue, 22 Nov 2011 17:08:05 +0000 (18:08 +0100)]
Accessibility: childAt returns interface

childAt used to return an integer.
Return an interface instead.

Not requiring a direct child to be returned allows optimizing
by bypassing iterating through the hierarchy of accessibles.
For QtQuick this is the only sensible way of implementing this.

The bridges are still responsible for finding the top-most element.

The default implementation in QAccessibleObject is sufficient
to return direct children. The implementation in
QAccessibleApplication is therfore no longer needed.

Change-Id: Id7100dd5bcc3a98de516a7f4a12eaaa41cb46d26
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoChange a slot into a virtual method.
Stephen Kelly [Thu, 15 Dec 2011 16:43:48 +0000 (17:43 +0100)]
Change a slot into a virtual method.

Implements a BiC Qt5 TODO.

Change-Id: Ie7dc32d954335019166dbd78d8b01ef79e2ad5c2
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove plugin related variables from the CMake files.
Stephen Kelly [Sat, 17 Dec 2011 10:42:11 +0000 (11:42 +0100)]
Remove plugin related variables from the CMake files.

It doesn't currently have any effect and needs to be re-thought
anyway.

Change-Id: I6e620ca5b341264bbf5279a19e8f25af8fa7d396
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoInclude the extras files after defining the target.
Stephen Kelly [Fri, 16 Dec 2011 23:46:11 +0000 (00:46 +0100)]
Include the extras files after defining the target.

Allows the extras file to contain references to the target.

Change-Id: I47332c4efcb7ba0132509a41fa3040531cd1c81f
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoMake QMetaTypeInterface POD.
Jędrzej Nowacki [Tue, 13 Dec 2011 15:12:32 +0000 (16:12 +0100)]
Make QMetaTypeInterface POD.

QMetaTypeInterface has to be POD because it is constructed in a static
array. Constructors in POD types are not allowed so we will use a macro
instead.

Change-Id: Iab9ae776dfe4dcd7148558f02d6181c5917aa5c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoEnable option to see filename extension in Mac save dialog
Chris Meyer [Sat, 17 Dec 2011 00:14:43 +0000 (16:14 -0800)]
Enable option to see filename extension in Mac save dialog

Many Mac OS users expect to have the option to see the file extension
of the file being saved in the save dialog. This patch enables that
option.

Change-Id: I7713bcef16b6f43135b382c7107f306009c7a0a1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdd check to make sure qApp exists before using
Chris Meyer [Sat, 17 Dec 2011 00:41:59 +0000 (16:41 -0800)]
Add check to make sure qApp exists before using

Check for qApp before using. I'm aware that this is in commented
out code right now; but I wanted to make sure it doesn't
accidently slip back in without this check so I'm submitting
this patch. It caused problems at shutdown in 4.8.

Change-Id: I1c2358ab94f8b698e5519b3e0f988fb5cdd653fa
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAvoid confusing method overloading in QTestTable.
Jason McDonald [Fri, 16 Dec 2011 04:01:12 +0000 (14:01 +1000)]
Avoid confusing method overloading in QTestTable.

The private class had two append() methods, one appending a column and
one appending a row.  Use more meaningful names instead of overloading
orthogonal operations.

Change-Id: I97e0268d6cb289694557846f244fe770cf980aaf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix fvisibility.test for "QMAKE_CXX = ccache g++"
David Faure [Tue, 13 Dec 2011 16:24:54 +0000 (17:24 +0100)]
Fix fvisibility.test for "QMAKE_CXX = ccache g++"

Testcase: adding this line at the end of mkspecs/linux-g++-64/qmake.conf
   QMAKE_CXX = ccache g++

Result:
  fvisibility.test: line 28: ccache g++: command not found
  Symbol visibility control disabled.

Result after fix:
  Symbol visibility control enabled.

Change-Id: I4049264a38a43e1bee3cb823d53836f0689f0b53
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoRemove note about Maemo5-reserved enum values, and renumber appropriately.
Robin Burchell [Thu, 15 Dec 2011 09:41:22 +0000 (10:41 +0100)]
Remove note about Maemo5-reserved enum values, and renumber appropriately.

With the ABI/API break, we can afford to do this.

Change-Id: Iaf318a56d572679322fde0448556eaa4242842d1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove widget attribute orientation values from Qt:: enum.
Robin Burchell [Thu, 15 Dec 2011 09:18:37 +0000 (10:18 +0100)]
Remove widget attribute orientation values from Qt:: enum.

These were only actually implemented on Symbian, thus, they aren't too useful,
apart from confusing developers when they don't work.

Removed per the discussion on:
http://lists.qt-project.org/pipermail/development/2011-December/000860.html

Change-Id: Id097cb392a3d964364adbe51a72a22927b9c382c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQSortFilterProxyModel: Fix warnings about unused variables.
Friedemann Kleint [Wed, 14 Dec 2011 15:03:44 +0000 (16:03 +0100)]
QSortFilterProxyModel: Fix warnings about unused variables.

Introduced by 4ebceaba394e54a4f43578e46839e3057e7e802d.

Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Change-Id: I81985c4121db5f6abd832f64ef412646daec6259
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoextract QWindowsPipeReader from qlocalsocket_win.cpp
Joerg Bornemann [Sun, 11 Dec 2011 16:09:10 +0000 (17:09 +0100)]
extract QWindowsPipeReader from qlocalsocket_win.cpp

The code for reading named pipes can now be used in
other places as well.

Change-Id: Id734617a3927e369491a6c5daf965169ceb01f74
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoCocoa: Accept mouse clicks that activates windows.
Morten Johan Sorvig [Fri, 16 Dec 2011 13:32:47 +0000 (14:32 +0100)]
Cocoa: Accept mouse clicks that activates windows.

Events for mouse clicks that active windows are by
default suppressed. Qt needs to see all events in
order to properly close popup windows.

Wether or not the event should be sent to the
target needs to be implemented later on - in the
QWidget world this is controlled by WA_MacNoClickThrough

Change-Id: I4b96d33978ed2b3cb793f52bb5b6fef234190a00
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoMove proxy and selection models to QtCore.
Stephen Kelly [Sat, 10 Dec 2011 18:13:51 +0000 (19:13 +0100)]
Move proxy and selection models to QtCore.

Change-Id: I71097855cb9e28105238e496778f29f99f7fc84e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQNetworkAccessManager: delay IPv4 connection with Happy Eyeballs
Martin Petersson [Fri, 16 Dec 2011 09:44:24 +0000 (10:44 +0100)]
QNetworkAccessManager: delay IPv4 connection with Happy Eyeballs

Incase we have both IPv4 and IPv6 available after the host lookup
we should delay the connection attempt to IPv4.

Task-number: QTBUG-23066
Change-Id: I8c0177cf125c9daae314ada73cacef790a39b856
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
12 years agoAvoid qDebug in verbose benchmark test output.
Jason McDonald [Thu, 15 Dec 2011 07:17:12 +0000 (17:17 +1000)]
Avoid qDebug in verbose benchmark test output.

Use QTestLog::info() rather than qDebug() to output informational
messages from testlib.  Source file and line are deliberately omitted as
they would come from testlib rather than from a test program.

Change-Id: I7b479bba4d3d553c6fa846d8d5ea2c29a8ef42b8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoSwitch off signal dumper when testing is completed.
Jason McDonald [Thu, 15 Dec 2011 05:03:08 +0000 (15:03 +1000)]
Switch off signal dumper when testing is completed.

Previously, if the signal dumper was switched on with the -vs
command-line switch, it would never be switched off again.

Change-Id: I192e188010471525723fad0844ff33e9482128ea
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoImproved path filling performance in the raster paint engine.
Kim Motoyoshi Kalland [Mon, 12 Dec 2011 11:57:08 +0000 (12:57 +0100)]
Improved path filling performance in the raster paint engine.

Convert bezier curves to polylines before rasterizing with gray
raster.

Change-Id: I353debd4338f2a3ce2fa1cfa1bff9dd2e36f05ab
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoCocoa: Update geometry on window move.
Morten Johan Sorvig [Wed, 14 Dec 2011 11:05:56 +0000 (12:05 +0100)]
Cocoa: Update geometry on window move.

Call [QNSView updateGeometry] directly. We can't
got through the frameDidChange notification since
we are not actually changing the QNSView frame.

Rename frameDidChangeNotification -> updateGeometry
sine it now handles updates from two different sources.

Change-Id: I848e558294093cd51d97778734b5cf872435266a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: Don't set window size in propagateSizeHints
Morten Johan Sorvig [Wed, 14 Dec 2011 10:19:33 +0000 (11:19 +0100)]
Cocoa: Don't set window size in propagateSizeHints

Unless QWindow:baseSize returns a valid value.
Setting the size caused lots of window geometry
instability in Creator.

Change-Id: Iab45e88b47207db900c7655c217959391d84a1bb
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: Add version check for convertRectToScreen.
Morten Johan Sorvig [Mon, 12 Dec 2011 09:32:03 +0000 (10:32 +0100)]
Cocoa: Add version check for convertRectToScreen.

convertRectToScreen was added in 10.7, use
convertBaseToScreen on 10.6

Change-Id: Ica1ee0f62e1fc9b0d5ccf463419496684da779b7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQTestlib-Selftest: Add initTestCase() setting the directory.
Friedemann Kleint [Tue, 13 Dec 2011 16:08:45 +0000 (17:08 +0100)]
QTestlib-Selftest: Add initTestCase() setting the directory.

Required for launching the sub-processes. The test worked only
when launched locally, not from 'make check'.

Change-Id: I42c9202a7726c3135f94445fb336b2b8241535a4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRename QEventDispatcherQPA to QUnixEventDispatcherQPA.
Robin Burchell [Sat, 10 Dec 2011 16:24:14 +0000 (17:24 +0100)]
Rename QEventDispatcherQPA to QUnixEventDispatcherQPA.

This removes confusion when we add a Linux-specific QPA dispatcher, and is
technically more accurate, as QEDQPA was not 'the' QPA event dispatcher in the
first place.

Change-Id: I2a41d425f284522ee76ef86782d5eb2bdd805120
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMerge integrity support into unix.
Robin Burchell [Sat, 10 Dec 2011 15:01:05 +0000 (16:01 +0100)]
Merge integrity support into unix.

Since integrity was pulling in all the same code (except the glib-in-QT_CONFIG
branch), we can just merge this in.

This shouldn't break integrity unless they somehow magically inject glib into
QT_CONFIG without actually having glib, but the removal of redundancy makes this
worthwhile.

Change-Id: I527b5e60bea4452fdca5eedfe729214f16519234
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoQLocalSocket/Win: eliminate checkReadyRead()
Joerg Bornemann [Tue, 13 Dec 2011 11:22:40 +0000 (12:22 +0100)]
QLocalSocket/Win: eliminate checkReadyRead()

Change-Id: I459c0ba42d3e5b0da57884f5cdfc6f44a11600f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQLocalSocket/Win: make emitReadyRead timer persistent
Joerg Bornemann [Tue, 13 Dec 2011 11:09:45 +0000 (12:09 +0100)]
QLocalSocket/Win: make emitReadyRead timer persistent

This saves us from creating a single shot timer every time we emit
readyRead and eliminates the parallel pendingReadyRead flag.

Done-with: ossi

Change-Id: I1de7f07b83b583b9d60dd8862d6a9f7865b5b891
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQLocalSocket/Win: fix behaviour on broken pipe
Joerg Bornemann [Wed, 14 Dec 2011 13:44:08 +0000 (14:44 +0100)]
QLocalSocket/Win: fix behaviour on broken pipe

We must not close the QIODevice, if we detect a broken pipe.
We still can have data in our read buffer that can be read by the user.

Autotest: tst_QLocalSocket::threadedConnection

Change-Id: Ibe823c006516acb27f51a06ca0bbe5555dbd88f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove Symbian support from /src/corelib/kernel/.
Robin Burchell [Sat, 10 Dec 2011 15:00:15 +0000 (16:00 +0100)]
Remove Symbian support from /src/corelib/kernel/.

Change-Id: Ic4a1b4f074d2ffd4cdfcb44e47c9bfccc2378760
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoQHeaderView - remove stupid if
Thorbjørn Lund Martsum [Thu, 15 Dec 2011 06:32:15 +0000 (07:32 +0100)]
QHeaderView - remove stupid if

Not only is this extra if unnecesary - it is confusing.
oldSize is different from size.
(otherwise we would have returned less than 10 lines above)

Change-Id: Ie911414f679df2be7b5c8bc2670225d46e986b32
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agofix QMutex warning in tst_QLocalSocket::threadedConnection
Joerg Bornemann [Tue, 13 Dec 2011 16:04:32 +0000 (17:04 +0100)]
fix QMutex warning in tst_QLocalSocket::threadedConnection

Change-Id: I5728af1944e44bd976e51d4f0c0a923deacbeea0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQHeaderView - no big update work if updates are disabled
Thorbjørn Lund Martsum [Wed, 14 Dec 2011 20:26:49 +0000 (21:26 +0100)]
QHeaderView - no big update work if updates are disabled

There is no reason to find out where to update the headerview
if updates aren't enabled.  Another approch I considered to skip the
whole calculation and just call update. I seriosly doubt that this
calculation and update of a particular QHeaderView rect will normally(*)
be faster than just updating everything.

However to be safe I have done the conservative fix.

(*) Normally but with many/fragmented spans in the headerview.

Change-Id: Ia812a747ee825653db0345cdc34f9d2f7155ea01
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoSplit timer handling out of QEventDispatcherUnix.
Robin Burchell [Tue, 25 Oct 2011 07:51:19 +0000 (09:51 +0200)]
Split timer handling out of QEventDispatcherUnix.

This makes it easier to see the guts of the unix event dispatcher, and to
experiment with it.

Change-Id: I715bb68c4de6798e10bc55304a128b88e0249c63
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoRemove unused ownObjectName field from QObjectData
Bradley T. Hughes [Tue, 13 Dec 2011 12:16:09 +0000 (13:16 +0100)]
Remove unused ownObjectName field from QObjectData

This field isn't used at all in qtbase, nor in any of the qt5
submodules.

Change-Id: If57d389935593f797818506a220c6a3cc04b6078
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QT_JAMBI_BUILD code
Bradley T. Hughes [Tue, 13 Dec 2011 12:15:28 +0000 (13:15 +0100)]
Remove QT_JAMBI_BUILD code

Change-Id: Ic9231b11293af4352f11cf075893175f0c9a471f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoCorrect sizeof(QObjectData) after out-of-order cherry-picks by Gerrit
Bradley T. Hughes [Tue, 13 Dec 2011 11:51:06 +0000 (12:51 +0100)]
Correct sizeof(QObjectData) after out-of-order cherry-picks by Gerrit

Commits a6ae75f92a8628c727a9c5a9961fa91c583c008e and
6f0f9f69288925ef423c542ef5eb7302a5431867 were cherry-picked in the wrong
order (despite the dependencies shown in Gerrit), causing the
QObjectData::unused bitfield to be too large.

Change-Id: I65acaa8b507f7f6f2c5735f45bd0ad8343abea54
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove Qt5 comment from qsignalspy.h.
Jason McDonald [Thu, 15 Dec 2011 04:04:50 +0000 (14:04 +1000)]
Remove Qt5 comment from qsignalspy.h.

The removed comment refers to a task in a bug tracker that no longer
exists.  The comment also mentions making (part of) testlib use Qt's
regular binary compatibility mechanisms, which is desirable in the long
term but not in scope for Qt 5.

Change-Id: I6f23a9a2c8a84e30afe2aeb5c53ea93c25ba6f11
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix incorrect function name in assertion.
Jason McDonald [Thu, 15 Dec 2011 03:52:56 +0000 (13:52 +1000)]
Fix incorrect function name in assertion.

Change-Id: I3eb8e7afe3f7ca514dd4839e603612b56c7d8082
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove QTest::qt_snprintf() from testlib API.
Jason McDonald [Mon, 12 Dec 2011 02:43:18 +0000 (12:43 +1000)]
Remove QTest::qt_snprintf() from testlib API.

This was an internal function that used to act like qsnprintf() but also
filtered unprintable characters out of the test output.  The filtering
has been moved somewhere more appropriate and this function is no longer
used by testlib.

Unfortunately, the function was exposed in the public API due to its
former use in the implementation of a public macro.

In the unlikely event that any code outside testlib calls this function,
the call should be replaced by calling qsnprintf(), which comes from the
QtCore/QByteArray header.

Change-Id: Iddc17b4361d16ebddd19346ae7d1064951dd7738
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix typos in QObject::(dis)connect warnings
Giuseppe D'Angelo [Wed, 14 Dec 2011 23:35:12 +0000 (23:35 +0000)]
Fix typos in QObject::(dis)connect warnings

For some strange reason "Object::method ..." was printed, without
the leading Q.

Change-Id: I10b99e8aa8730e4020d15b3e04a01004bade76c3
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix qimagereader, qmovie and qmake unittest to work in shadow build.
Kurt Korbatits [Wed, 14 Dec 2011 23:34:50 +0000 (09:34 +1000)]
Fix qimagereader, qmovie and qmake unittest to work in shadow build.

Changed to use QFINDTESTDATA and TESTDATA.

Change-Id: I8684bc191cf8ffb8b531456e32047d582ebc018c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoApplication-test: Fix location of sub-executables.
Friedemann Kleint [Wed, 14 Dec 2011 08:27:33 +0000 (09:27 +0100)]
Application-test: Fix location of sub-executables.

Use QFINDTESTDATA to set the working directory
and change the profiles accordingly (as in
the qprocess-test).

Change-Id: I332038728c64214f73ced448e1466ad96c11b3b3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoImprove QTest::keyClick documentation.
Jason McDonald [Wed, 14 Dec 2011 07:54:13 +0000 (17:54 +1000)]
Improve QTest::keyClick documentation.

Make it clear that the delay is applied before each key-click is
simulated.

Change-Id: Id100f1f2db1a5b1651c3046905719d7eb06ec1a0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>