summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix whitespace consistency.Stephen Kelly2011-12-211-4/+4
| | | | | Change-Id: Ia5debce8e5be4e9c67e1ef303e136816ab55bf90 Reviewed-by: David Faure <faure@kde.org>
* Fix -tickcounter in qtestlib.Robin Burchell2011-12-211-2/+0
| | | | | | | | | | 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>
* Remove mention of Trolltech in installation path.Jason McDonald2011-12-211-2/+2
| | | | | | | | Task-number: QTBUG-19653 Change-Id: Ic92e0bb4980af53568efe77ebc72e048ee5a32d7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge QReadWriteLock constructor overloads per Qt 5 comment.Robin Burchell2011-12-202-11/+3
| | | | | Change-Id: I3b569b1240a0bc5b2589de353dbf62c175472448 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add missing connections.Stephen Kelly2011-12-201-0/+8
| | | | | | | Unit tested in next commit. Change-Id: Iab37829f98ef8f2258a30aed60e95aa114379b7e Reviewed-by: David Faure <faure@kde.org>
* Remove unused QPicture::detach_helper() private method.Robin Burchell2011-12-202-12/+0
| | | | | | | 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>
* Remove non-const QMovie::cacheMode().Robin Burchell2011-12-202-11/+0
| | | | | | | 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>
* make QString::fromLatin1 partially inlineHarald Fernengel2011-12-202-6/+6
| | | | | | | | This allows us to benefit from compile time optimizations when calling strlen() Change-Id: If6694117e613a012fce97f8664e6b43005d255de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fixqt4headers: Add QtCore to folders (for moved item models).Friedemann Kleint2011-12-201-0/+1
| | | | | Change-Id: I71f805c618a888e654207fb29f68769f9d90db9b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove unused qInitResourceIO() method.Robin Burchell2011-12-201-2/+0
| | | | | | | | 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>
* Remove qt_image_id() and qt_image_colortable().Robin Burchell2011-12-203-15/+0
| | | | | | | | 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>
* Adapt from input context mousehandler to input panel in QLineEditPekka Vuorela2011-12-201-7/+6
| | | | | | Change-Id: If14d0cc18188da1dbc8b152fa2fa9583ff03b3bc Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove input context action support from editorsPekka Vuorela2011-12-202-25/+0
| | | | | | | | 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>
* Remove QInputContext based test from QGraphicsItem testsPekka Vuorela2011-12-201-82/+0
| | | | | | | | | 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>
* Removed test for obsolete QInputContextPekka Vuorela2011-12-203-408/+0
| | | | | | Change-Id: Idb3b909934434f8f55eb6e94aa814840ab628856 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Adapt from QInputContext interface to QInputPanelPekka Vuorela2011-12-201-18/+14
| | | | | | Change-Id: I4143c3b516e7b0e46c706b8a6560bca9d8951572 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Add destructor to QPlatformFontDatabase.Frederik Gladhorn2011-12-202-0/+8
| | | | | | | Virtual functions deserve a virtual dtor. Change-Id: I71b7ae3b7fb0aa1553a37a90dce6270740d49e32 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Revert "Revert "Add QObject::objectNameChanged(con... signal""Alan Alpert2011-12-204-22/+28
| | | | | | | | | 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>
* Better error reporting in case of connection failure.Olivier Goffart2011-12-202-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Retire QTest::pixmapsAreEqual().Jason McDonald2011-12-205-26/+20
| | | | | | | | | | | | | 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>
* Remove declaration which is exported from QtGui.Stephen Kelly2011-12-192-2/+1
| | | | | | | Fixes static build. Change-Id: I6f82ded7bf6cb3b72b0ef987e781c7e8f9ed932b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix QDir::removeRecursively so it doesn't follow symlinks to directories.David Faure2011-12-192-1/+27
| | | | | | | | 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>
* Fix QNetworkReply test cases that use the MiniHttpServer on windowsShane Kearns2011-12-191-1/+1
| | | | | | | | | | | | | 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>
* Fix regression in user-agent setting of http proxy in a QNetworkRequestShane Kearns2011-12-191-2/+5
| | | | | | | | | | | 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>
* Update the touchscreen plug-in.Laszlo Agocs2011-12-195-148/+188
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Do not call QueuedConnection slot on partialy destroyed objectOlivier Goffart2011-12-192-5/+18
| | | | | | | | | | | | 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>
* Windows: Remove Window from list before calling DestroyWindow.Friedemann Kleint2011-12-191-2/+2
| | | | | Change-Id: Ifef99d9e4e46f0450cecf8ecba18ce79ebec3e8d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Q_STATIC_ASSERT: fix C style castOlivier Goffart2011-12-191-1/+1
| | | | | | | | 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>
* Accessibility: childAt returns interfaceFrederik Gladhorn2011-12-1922-201/+142
| | | | | | | | | | | | | | | | | | 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>
* Change a slot into a virtual method.Stephen Kelly2011-12-193-15/+9
| | | | | | | | Implements a BiC Qt5 TODO. Change-Id: Ie7dc32d954335019166dbd78d8b01ef79e2ad5c2 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove plugin related variables from the CMake files.Stephen Kelly2011-12-192-8/+0
| | | | | | | | | 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>
* Include the extras files after defining the target.Stephen Kelly2011-12-191-8/+8
| | | | | | | | 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>
* Make QMetaTypeInterface POD.Jędrzej Nowacki2011-12-194-28/+33
| | | | | | | | | 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>
* Enable option to see filename extension in Mac save dialogChris Meyer2011-12-191-0/+1
| | | | | | | | | 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>
* Add check to make sure qApp exists before usingChris Meyer2011-12-191-1/+1
| | | | | | | | | | 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>
* Avoid confusing method overloading in QTestTable.Jason McDonald2011-12-191-6/+6
| | | | | | | | | 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>
* Fix fvisibility.test for "QMAKE_CXX = ccache g++"David Faure2011-12-181-2/+2
| | | | | | | | | | | | | | | 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>
* Remove note about Maemo5-reserved enum values, and renumber appropriately.Robin Burchell2011-12-181-14/+2
| | | | | | | With the ABI/API break, we can afford to do this. Change-Id: Iaf318a56d572679322fde0448556eaa4242842d1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove widget attribute orientation values from Qt:: enum.Robin Burchell2011-12-183-52/+0
| | | | | | | | | | | 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>
* QSortFilterProxyModel: Fix warnings about unused variables.Friedemann Kleint2011-12-161-4/+4
| | | | | | | | | Introduced by 4ebceaba394e54a4f43578e46839e3057e7e802d. Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Change-Id: I81985c4121db5f6abd832f64ef412646daec6259 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* extract QWindowsPipeReader from qlocalsocket_win.cppJoerg Bornemann2011-12-166-227/+475
| | | | | | | | 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>
* Cocoa: Accept mouse clicks that activates windows.Morten Johan Sorvig2011-12-161-0/+5
| | | | | | | | | | | | | 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>
* Move proxy and selection models to QtCore.Stephen Kelly2011-12-1636-49/+49
| | | | | | Change-Id: I71097855cb9e28105238e496778f29f99f7fc84e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QNetworkAccessManager: delay IPv4 connection with Happy EyeballsMartin Petersson2011-12-163-1/+31
| | | | | | | | | 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>
* Avoid qDebug in verbose benchmark test output.Jason McDonald2011-12-161-2/+6
| | | | | | | | | | 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>
* Switch off signal dumper when testing is completed.Jason McDonald2011-12-161-0/+3
| | | | | | | | 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>
* Improved path filling performance in the raster paint engine.Kim Motoyoshi Kalland2011-12-164-55/+93
| | | | | | | | Convert bezier curves to polylines before rasterizing with gray raster. Change-Id: I353debd4338f2a3ce2fa1cfa1bff9dd2e36f05ab Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Cocoa: Update geometry on window move.Morten Johan Sorvig2011-12-153-7/+9
| | | | | | | | | | | | | 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>
* Cocoa: Don't set window size in propagateSizeHintsMorten Johan Sorvig2011-12-151-7/+1
| | | | | | | | | | 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>
* Cocoa: Add version check for convertRectToScreen.Morten Johan Sorvig2011-12-151-7/+12
| | | | | | | | convertRectToScreen was added in 10.7, use convertBaseToScreen on 10.6 Change-Id: Ica1ee0f62e1fc9b0d5ccf463419496684da779b7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>