summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove insignification of QSizeGrip test on Mac OS X.Jason McDonald2012-04-242-2/+1
| | | | | | | | | The test has one stable failure. Mark it with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-23681 Change-Id: Iade17cbbd1570863bb628572d8da52ec9c0f62ba Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Skip unstable tst_QMdiArea::subWindowActivated2 test on Mac OS X.Jason McDonald2012-04-241-1/+1
| | | | | | | | | This test function recently became unstable in parallel with the change to re-enable the test. Skip the unstable function until it can be fixed. Change-Id: I0fb962aa3294a0c9b799acee52ab1fb1cd1c6924 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Remove Qt 5 todo in QVariant: we're not going to change the behaviourThiago Macieira2012-04-241-2/+0
| | | | | | | Task-number: QTBUG-25111 Change-Id: I2387767698c402e2bd0ecdfdd6ed41d4a224f1b6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Change Windows font database to use qendian.hMiikka Heikkinen2012-04-241-111/+85
| | | | | | | | Removed the custom BigEndian class and utilized qendian.h functions instead. Change-Id: Ieb10f77411404e1524fcedaceffa5b0e333c7429 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Rename the default organisation from "Trolltech" to "Qt" on MacThiago Macieira2012-04-231-1/+1
| | | | | | | | | This doesn't seem to be documented -- or if it was, the documentation has been changed. Task-number: QTBUG-23269 Change-Id: Ie7aa51aeb251bfaa3d0018fbac4adc9517c97fa0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qdoc: Don't write '...' for empty <apiName>Martin Smith2012-04-231-2/+2
| | | | | | | qdoc now <apiName/>, when there is no name. Change-Id: I0aa85eef633776f691c9e2238514194cf89b8a8f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Update qdoc to use QML spec for DITAMartin Smith2012-04-234-190/+285
| | | | | | | | qdoc now generates DITA XML from QML docs according to the QML specialization. Change-Id: I51d93c2ab3b1deefab9bbedcd2e752f49648809f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Removed unused QUrlPrivate::clear()Simon Hausmann2012-04-232-19/+0
| | | | | | | The function is not used anymore. Change-Id: Idfdc0505358421a866b15e2ad322679a1808e223 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use the Q_PROCESSOR_* macros in qsimd.cppThiago Macieira2012-04-231-3/+3
| | | | | Change-Id: I7be9b14a24329be32c43603ae87df17328696109 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove insignification of QMdiArea test on Mac OS X.Jason McDonald2012-04-232-1/+16
| | | | | | | | | This test has only stable failures on Mac. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25298 Change-Id: I1c768226dfeb9307386e8853091baa68936bed29 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Set thread name on QNXSean Harmer2012-04-231-1/+3
| | | | | | | Change-Id: I4fc786afce2e53676b148332dddd2c84228f7d87 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QTimer: fix typo in singleShot optimization for 0 msecsGiuseppe D'Angelo2012-04-231-1/+1
| | | | | | | | | The SIGNAL/SLOT/METHOD(x) macros prepend a character between '0' and '2' inclusive, and not '0' and '3'. Change-Id: Ibdbf442422925a43f956b2ba70f1f9c6a2812305 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Add workaround for projects using 'QT += declarative'"Friedemann Kleint2012-04-231-27/+0
| | | | | | | | | | | | | The workaround should no longer be necessary. It causes compile errors for MinGW since the command lines are too long. This reverts commit 6225e3ba01ef918724a15dd1311ab5d8205be534. Change-Id: I0288f4621f072b91dc94f25092ef124fa4c1b09e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't use the QRegExp methods that modify the object [qmake]Thiago Macieira2012-04-231-1/+1
| | | | | | | | | | | | | QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: I6b2d2530238a7e04b44859664a2962f2f466ee30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add missing private headers to testlib.proThiago Macieira2012-04-231-0/+5
| | | | | Change-Id: Id927b05374b9e82fbee029258f176223b8b32e90 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Move Q_FUNC_INFO to qcompilerdetection.hThiago Macieira2012-04-232-13/+11
| | | | | | Change-Id: Ibc63913f070febe561890e98ef079ca883d9bfc9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Move the QT_STRINGIFY macro to the top of qglobal.hThiago Macieira2012-04-231-10/+4
| | | | | | | | | This will allow me to use them in qcompilerdetection.h. Also, leave them defined. Change-Id: I73cb39e3cfcc2463d1d47a856e4a64354ebe743c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QSqlQueryModel::setQuery() don't use deprecated reset()Mark Brand2012-04-237-125/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the method attempted to reset only as a last resort. Now reset() is deprecated and resetting must happen between emitting modelAboutToBeReset() and modelReset(). Since this suffices in all cases to notify views that they must reinterrogate the model, it is no longer necessary to signal explicitly row removals and insertions within the scope of the reset. Additionally, fetchMore() is now called within the scope of the reset so insert signals do not have to be emitted here either. This improved handling of resetting in QSqlQueryModel also allows the cache in QSqlTableModel to be cleared directly at select(). This change may actually allow views to operate more efficiently since they no longer have to react to separate row removal and insert signals. Views can avoid pointless deallocation and reallocation by considering row count only after the reset is finished. The cost is that the columns and horizontal headers must be considered in the view at each setQuery() call. In any case, it is not clear that trying to be smart about this in the model justifies additional complexity. Tests had to be adjusted where they expected explicit row removal and insert signals. Change-Id: I4f7eac1419824361d7d9bdcc6a87092b33e80d7a Task-Id: QTBUG-25419 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* QSqlQueryModel::fetchMore() documentation fixMark Brand2012-04-231-1/+1
| | | | | | Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Set default Lighthouse plugin for QNXAndreas Holzammer2012-04-231-0/+3
| | | | | | | Change-Id: Id1e51fcd3ce795b2c408d0376679597f6da5c33a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Build the QNX plugin with -no-opengl enabled.Stephen Kelly2012-04-235-9/+59
| | | | | | Change-Id: I776a3eb0d7ada4399b8c191bbfa1e3ed9236b20e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Move the CMake unit tests to auto/Stephen Kelly2012-04-2335-0/+51
| | | | | | | | | | This will allow the CI system to run the tests. The tests are only run if cmake is found. Change-Id: Ie73a56114c151871160bafcbf0b90b2d54620855 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Don't tell CMake we're making debug libraries if we're not.Stephen Kelly2012-04-231-2/+2
| | | | | | | | | | | | The config option debug_and_release is set on Windows and on mac (unless xcode is used independently of whether Qt is configured with -release or not.) We need to check CONFIG(release,debug|release) to see if -release was set. Change-Id: Ibf952958874f6b102981526b3397e848c207a3f2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix compilation of QDesktopServices without deprecatedOlivier Goffart2012-04-232-5/+6
| | | | | Change-Id: I9e225d32b3f7db403cf3eea6a277580b4b7410a7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix warning in qobject.cppOlivier Goffart2012-04-231-0/+1
| | | | | | | Variable only used in debug mode Change-Id: I6601ca68c427b909680423ae81802f1ed5cd178a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Windows: Fix QRawFont loading from data.Miikka Heikkinen2012-04-235-5/+653
| | | | | | | | | | | | | The implementation for loading QRawFont from data was missing from Windows QPA plugin. For freetype font database, just called the parent QBasicFontDatabse implementation. For native font database, ported the implementation from Qt 4.8 qrawfont_win.cpp. Task-number: QTBUG-24197 Change-Id: Ia784d4cbc4f37c925aa49e53d04faf06a7169a73 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Start running some disabled tests again on Mac OS.Jason McDonald2012-04-238-11/+7
| | | | | | | | | | | | | These tests were disabled when trying to get CI working on Mac OS because they asserted or crashed. Now that CI is working well on Mac OS, start running these tests again, initially as insignificant tests. CI results will then be used to determine whether the tests can be made significant. Change-Id: Ife411e6b8c84ade45c865ef35f3ae0071d6f8d2b Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDoc: Support -indexdir on CLI and depends in qdocconf.Casper van Donderen2012-04-234-0/+60
| | | | | | | | | You can now specify a list of modules in the "depends" qdocconf variable. This stringlist is then used by the -indexdir option to specify in which directory to search for [depends entry]/[depends entry].index Change-Id: Icab6dd0133e180ac04365da9605743def6fb754d Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Doc: Fix most QDoc errors in QtXml.Casper van Donderen2012-04-2314-116/+974
| | | | | | | | | | Changes: - XML processing document moved from Qt XML Patterns. - Moves documentation from /doc/src to /src/xml/doc - Add new qdocconf file. Change-Id: I4bc2104714a28905304997e5ff252e662ddf0bee Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix unmatched double quote characterJonathan Liu2012-04-231-1/+1
| | | | | Change-Id: I25fb7dac38db2800ce974d40ec275d510f6d47f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Re-enable QGraphicsView test on Windows, Mac and Ubuntu 11.10.Jason McDonald2012-04-232-8/+5
| | | | | | | | | | | | | | | On Windows, the test had a stable failure and an XPASS related to an already closed bug report. On Mac, the test had one stable failure, on the same statement that had the XPASS on Windows. On Ubuntu, the test has been passing consistently. Mark the stable failures with QEXPECT_FAIL, remove the QEXPECT_FAIL that causes the XPASS, and remove the insignificant_test markers to re-enable the test. Task-number: QTBUG-24296 Change-Id: I05dd16b39296919268fee216332929df591f2b66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix bug in qsslsocket peek()Kalle Viironen2012-04-234-0/+316
| | | | | | | | | | | | | | | | | | Calling peek() for qsslsocket caused socket data to be copied into qiodevices buffer and therefore make it unaccessible in qsslsocket. Cherry picked form 4.8-branch & modified to Qt5 API changes (int -> qintptr) Original commits: commit 621f18955082fc73471e75d1f8c35c2dcd4befeb Author: Shane Kearns <ext-shane.2.kearns@nokia.com> commit 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513 Author: Kalle Viironen <kalle.viironen@digia.com> Task-number: QTBUG-18498 Change-Id: I6be4b19baec2f3197537f5e7b61432040ec84ad2 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix XPASS in QGraphicsWidget test on Ubuntu 11.10.Jason McDonald2012-04-232-2/+2
| | | | | | | | | | | This test was marked insignficiant on Ubuntu 11.10, but the only failure was an XPASS. Make the test significant again, and only include the QEXPECT_FAIL for CI platforms where the test is known to fail, i.e. Windows and Ubuntu 10.04. Task-number: QTBUG-20778 Change-Id: I24af3dab45118758382ba03c8c7a310f16301f8c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from QGraphicsProxyWidget test on Windows.Jason McDonald2012-04-232-2/+9
| | | | | | | | | This test has three stable failures on Windows. Mark those failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-24294 Change-Id: I9eee2701a228912c3a91fa730e712661fb93add6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from QCompleter autotest.Jason McDonald2012-04-231-2/+0
| | | | | | | | | Until March 15, 2012, this test failed consistently on Mac and passed on other platforms. Since then, the test has passed consistently on all platforms. Change-Id: Ie773643a1c9dc0ab3596786badbc3c3afd4824d6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make the QNX QPA plugin work with non blackberry.Stephen Kelly2012-04-239-73/+118
| | | | | | | | Change-Id: Id85d18d9f21711e8d53e8e4bfdf39d10e135f593 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Send Expose event when top level window becomes visibleKevin Krammer2012-04-232-0/+10
| | | | | | | | Change-Id: I0b45c27fa03bbe073c88ce8d01d9fb283f4051c1 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QTextLayout::d is privateGirish Ramakrishnan2012-04-231-1/+1
| | | | | | | Compile fix for tst_qtextscriptengine.cpp test on the mac. Change-Id: I912a339c6c659dc8958cc5997a331e3c18c9cb06 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Removed invalid C-style license header from .pro fileRohan McGovern2012-04-231-40/+0
| | | | | | | | | | | /* C-style comments */ cannot be parsed by qmake. Additionally, Qt Project legal has agreed that .pro files do not need to be covered by license headers. Change-Id: Ie4d75ee09c2fc85a2f954ec4a931b36ea9d51d93 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Don't assume QAbstractDeclarativeData::objectNameChanged is available.Michael Brasser2012-04-231-1/+1
| | | | | | | | Preparation for removal from declarative now that a proper NOTIFY signal exists. Change-Id: If0acb73b73d17c49dc8de211d95ecd1e8e80ff1b Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Use org.example instead of com.trolltech for the D-Bus examplesThiago Macieira2012-04-2218-31/+31
| | | | | | | | | | We could use org.qtproject, but since this is an example anyway, and since example.org and example.com are reserved to IANA by RFC 2606 anyway, let's use that. Task-number: QTBUG-23274 Change-Id: Icdb1ac0390f88b72fa21b02ab362f1a98f26266c Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Replace com.trolltech with org.qtproject in D-Bus's performance testsThiago Macieira2012-04-223-5/+5
| | | | | | | | I had missed these, apparently. Task-number: QTBUG-23274 Change-Id: I6455dc34b18ec9cefccfe527b3fd3ad34fb61aa3 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Examples: Don't use deprecated methodsOlivier Goffart2012-04-2114-26/+28
| | | | | Change-Id: Ib6e795f6b5bb6a3ac19882a5fb224460ef1fc8ad Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Ensure that qXXXdetection.h can be included directlyThiago Macieira2012-04-214-0/+13
| | | | | | | | | Those files might have dependency on one another, on qconfig.h and on early qglobal.h definitions, so ensure that the only correct include order is that of qglobal.h. Change-Id: I89098bacaf16353ee8b51604ee885508dc8e201a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Make the fallback Q_ASSUME and Q_UNREACHABLE be qt_noopThiago Macieira2012-04-211-2/+2
| | | | | | | | That way, we can properly add ; after them, and I can use Q_ASSUME in Q_ASSERT's else condition. Change-Id: Iad35819fbb06714116b7dd0f952e1c2c89044c72 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Move Q_DECL_{IMPORT,EXPORT,HIDDEN} to qcompilerdetection.hThiago Macieira2012-04-212-29/+29
| | | | | | | | | | | | | | Mindful of QT_VISIBILITY_AVAILABLE and Q_OS_WIN for GCC: when GCC is used on Windows (i.e., MinGW or potentially Cygwin), use the declspec variant so we produce proper DLL imports and exports. When used on other platforms, rely on configure adding QT_VISIBILITY_AVAILABLE to qconfig.h, which confirms that the -fvisibility argument is available. That flag has been available since GCC 4.0 on ELF targets, but it could be missing on some other targets. Change-Id: I3dbc0043c1eaee0c469c5b1dc8bf05842fe9cd47 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Move some compiler macro definitions into the compiler sectionsThiago Macieira2012-04-211-26/+12
| | | | | | | Makes for a couple of cleaner definitions of fallbacks. Change-Id: I9b1a6f77bab986514e1862ae1f431ea37b89c1b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Move the compiler-related macros to qcompilerdetection.hThiago Macieira2012-04-212-109/+110
| | | | | | | | This cleans up qglobal.h a little further and organises things a bit more. Change-Id: Ic025e720941cdf59b8a1a0baf515b29f25eba0f1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Compile on Windows.Jan-Arve Saether2012-04-211-2/+8
| | | | | | | | | | | The previous code was trying to sum one pointer with one string literal... Using QVarLengthArray should also potentially speed things up a bit, since it will avoid a malloc if className is small enough (less than 15 bytes). Change-Id: I41218babb3030e7e6f9c31fc77e4af1c209ae0a5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix typo in backwards compatibility code.Stephen Kelly2012-04-211-1/+1
| | | | | | | The patch just submitted to Qt4 is not affected by this. Change-Id: I3f38f1a56f2a9a2058b2c8ff0a6ee1715be41e85 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>