summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix compilation with Q_DECL_OVERRIDEOlivier Goffart2012-04-203-6/+6
| | | | | | | In C++11, the override keyword is placed after the function declaration Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Build the tests with the build type that the top-level was invoked with.Stephen Kelly2012-04-201-0/+2
| | | | | | Change-Id: I87918276987b3a506c2ac8556940fce89a2d20cd Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QDataStream: Update Version info for docAurindam Jana2012-04-201-1/+1
| | | | | | | | | | QDataStream::Qt_5_0 was modified in aee1f6cc413f56bf4962324799ee3887c3dd037f but the documentation was not updated. Change-Id: I520798a7572b0f21cd275290bcd689e1b686d098 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Silence two warnings in QVariant's unit test.Thiago Macieira2012-04-201-0/+3
| | | | | | | These warnings are expected and correct, so ignore them. Change-Id: I43931950e46bd3c931db869902574ee7219efa1d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Don't push unnecessary data to a data stream for QVariant()Thiago Macieira2012-04-203-8/+8
| | | | | | | | Adjust the test because we don't read past the end anymore. Task-number: QTBUG-25108 Change-Id: I8243f1d5ae79d1256aab2cb1132598a716a7eeeb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Windows - "bypass proxy for local..." also affects IP addressesShane Kearns2012-04-202-2/+23
| | | | | | | | | | | | | | | | If the "bypass proxy for local addresses" option is enabled in the windows proxy configuration, then do not use the proxy for any IP address in the subnet of any network interface. As the systemProxyForQuery api is now offering HTTP proxy tunnels for TCP sockets, this change avoids local ad-hoc network connections being routed through the proxy. In the case where the local address was on a different interface to the proxy server, it may have been unreachable through the proxy. For example IP over USB or Bluetooth. Change-Id: I0842732832a7795112be029d923ed168edc008d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make sure -fPIE is added to the compile flags.Stephen Kelly2012-04-201-0/+2
| | | | | | Change-Id: I279881693b6eba15a2e145742b3281c9425e9b2e Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only run the CMake DBus unit tests on UNIX systems.Stephen Kelly2012-04-201-1/+3
| | | | | | Change-Id: I0c5b511229a7ac0c2aa23a9c3d2053077e94936c Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Windows: Remove fontengine autodetection logicMiikka Heikkinen2012-04-202-8/+3
| | | | | | | | Always default to native font engine as native fonts now work in QML applications, too. Change-Id: Iafa5f6d25a9a3b22f49763f287e4e358216cfc2d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Window geometry manual tests: Add Window state controls.Friedemann Kleint2012-04-208-197/+664
| | | | | | | | | - Factor out controls from the window flags test, split state into Qt::WindowState (QWindow) and Qt::WindowStates(Qt::Widget). - Add to geometry test. Change-Id: I25b9a8696bfb7f4faef113ac82559ebb90a140c5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix missing Windows native fonts in QML applicationsMiikka Heikkinen2012-04-201-0/+3
| | | | | | | | | | | Windows native fonts were not getting rendered because the font engine was cloned incorrectly for QRawFont, resulting in multi-engine instead of the specific cloned engine. Task-number: QTBUG-25410 Change-Id: I08f543e541739ac1b51f96f381ae1bb20b59399a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Disable the tst_exceptionsafety_others test completely.Thiago Macieira2012-04-201-1/+1
| | | | | | | | | | | | | | | | QObject is no longer exception-safe and there's no one working on improving this, so let's not block innocent commits because of this failure. QObjectPrivate's constructor initialises the QObjectPrivate::threadData member to null, but the destructor dereferences it unconditionally (the member is initialised in the QObject constructor). That means QObjectPrivate is not exception-safe by any definition and, so, anything depending on QObject is not exception-safe. Change-Id: If9d5004630b7ce2fb357e328627794caad67564f Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Stabilisation of tst_qnetworkreply on windowsShane Kearns2012-04-201-8/+14
| | | | | | | | | | Workaround QTBUG-24451 by retrying creation of SocketPair if it fails (waitForConnected and waitForNewConnection are used in the factory function). Skip very unstable test cases due to QTBUG-25386 Change-Id: I32129922329b895eb3719d61719c487a4d52c466 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-201-4/+4
| | | | | | | | | Previously we printed "[Previous: <link>] and [Next: <link>]. After this change we only print the <link>, which should include an icon. Change-Id: I30d0c7d53b70ec2e537774d57a4ac9af01b26b16 Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Revert "List QtPrintSupport as a dependency of QtPlatformSupport."Lars Knoll2012-04-201-1/+1
| | | | | | | | | | | | This reverts commit 9c7cdce672df7da5c84b0ae6ca10ff09a670a315. platform support does not and should never depend on widgets or print support. Change-Id: I828d1dfc02e7993325cf653ed92100750761eaae Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix MSVC conversion warnings in new bytearray code.Friedemann Kleint2012-04-203-12/+13
| | | | | | Change-Id: Ifc81564daf3fef0d7f08ae8d250ba41d3b1d5b0f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QSslSocket: call to ERR_free_strings to free loaded error stringsMartin Petersson2012-04-203-0/+5
| | | | | | | | | | Since we are calling q_SSL_load_error_strings to load error strings we should call ERR_free_strings to free the memory again. Task-number: QTBUG-15732 Change-Id: Ie41291bb0e1434f82025378edfca51930712a8aa Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix crash in QCocoaBackingStore.Morten Johan Sorvig2012-04-202-4/+7
| | | | | | | | | | QWindow->handle() may be null during construction, and also during calls to resize(). Get and check the pointer at each call instead of caching it in the constructor. Change-Id: Icd950b55e16fdd2077e3b7fe3c3393d8b89b5903 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* mingw: fix a lot of annoying warningsKonstantin Ritt2012-04-204-166/+166
| | | | | | | | | like "QRect::intersected() redeclared without dllimport attribute after being referenced with dll linkage" (-fno-keep-inline-dllexport) Change-Id: Id24e5ee857579ee9f97a60de0ab88ce3db8385cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Implement QCocoaWindow::setWindowState.Morten Johan Sorvig2012-04-2010-46/+156
| | | | | | | | | | | | | | | | | | | | Add window state change notification logic. Send and expose event in addition to window state change on window restore since the QWidget logic expects this. Modify QCocoaWindow::setVisible to sync up window state that may have been set on the hidden window. Refactor NSWindow event observing to use one observer function for all notifications. Add window state testing to tests/manual/windowflags Add delay after showFullScreen in tst_qstatusbar to wait for the Lion fullscreen transition. Change-Id: I57c523cedd0644d4181b40d72046fad4fdb09a9c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Set the window title for the QWindow as well.Morten Johan Sorvig2012-04-201-0/+1
| | | | | Change-Id: I2ff20307974c4b6a2a4fb09d09941d0a0dd09d0e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove insignification from QComboBox test on Ubuntu 11.10.Jason McDonald2012-04-201-2/+0
| | | | | | | | This test has not failed in the last 400 CI runs. Task-number: QTBUG-23639 Change-Id: I2a8e105ebcba3654a6aac4fd8207c8fbcd2c4db3 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Retain bidirectional marks when eliding textEskil Abrahamsen Blomfeldt2012-04-201-2/+44
| | | | | | | | | | | | When the text contains unicode markers for bidirectional text, these will not affect the width of the text, but they might affects its layout. Thus, we need to retain these markers in the elided text to avoid the layout of the string changing when its allocated width changes. Task-number: QTBUG-3768 Change-Id: I3866c32cd1dcd5fff2b8fa5b25ae89e551531a97 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Made hellowindow example respect the expose event.Samuel Rødal2012-04-202-4/+11
| | | | | | | The expose event is sent when the window can start rendering. Change-Id: Ifdfb01a107e3bf665fb7be65802cdaabea4c5a34 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Adjust device mkspecs to use qpa default plugin varDonald Carr2012-04-207-2/+12
| | | | | Change-Id: If7be3517a423324e744805e8508eb9277a600ed4 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Provide versions of qRegisterMetaType() that do not normalize typename.Martin Jones2012-04-202-12/+70
| | | | | | | | | QML is quite capable of providing typenames in the correct format. qRegisterNormalizedMetaType() does not normalize the typename, so avoids the huge overhead. Change-Id: I96c9a42fe0b5d36ac05a9247f6507dbf9583fa67 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>