summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Minor QObject::receivers() optimization.Michael Brasser2012-04-201-0/+3
| | | | | | | | Don't lock if there are no receivers. Change-Id: I922fad10436adeb27aa4f193cc0dcbaa3f0c0f1e Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Minor QObject::receivers() cleanup.Michael Brasser2012-04-201-2/+1
| | | | | | | | Return 0 rather than false; remove extra Q_D(). Change-Id: I3dac733c3fae27c76790f09fd6b63356767a0363 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add a receivers callback to QAbstractDeclarativeData.Michael Brasser2012-04-202-0/+7
| | | | | Change-Id: I767fabd66c7de535db26e779855d21ec5b94e947 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix compilation with QT_NO_DEBUG_OUTPUT definedAndy Shaw2012-04-206-1/+13
| | | | | Change-Id: If96e93c08240e0f626f8e465993b2c38b2cad832 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ensure that this widget has focus before sending a keypress.Stephen Kelly2012-04-201-0/+2
| | | | | | | | | This doesn't fix the bug, but confirms that it is CI flakyness. Task-number: QTBUG-21098 Change-Id: Ic37a7574af88205371f4b2c24113d12b1386835c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add some more output to debug a flaky test.Stephen Kelly2012-04-201-2/+8
| | | | | | | Task-number: QTBUG-23638 Change-Id: Ib6a8634ede4b6461e41ce6843ac2654dcd1999f5 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QImage: fix declaration of inline methodsKonstantin Ritt2012-04-201-4/+4
| | | | | Change-Id: If97f423329705dccf98742089362db9eecb55087 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Mark qt_assert and qFatal as non-returning functions (excpt. MSVC)Thiago Macieira2012-04-193-0/+14
| | | | | | | | | | | | | | | | | | | This allows the compiler to optimise the code a bit better: since they don't return, it can assume in the code after the Q_ASSERT that the condition was true. MSVC is the exception: with MSVC, we have the CrtDbgReport dialog, which allows the developer to continue execution, inside the debugger. Therefore, we can't mark any of those functions as non-returning because they can, after all, return. Unfortunately, the Q_ASSERT usually expands to no code in release mode, so the improvement in code generation happens in debug mode only... Change-Id: I4d542d6853cd51c71ffab1d563ed64ef7c419115 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* PrintSupport - Remove Qt5 To-do MessagesJohn Layt2012-04-192-2/+2
| | | | | | Task-number: QTBUG-25085 Change-Id: I4cf3cc4827f5cc0eeade36cfde94472fab3abb92 Reviewed-by: John Layt <jlayt@kde.org>
* Remove insignification from QMdiSubWindow test on Mac OS X.Jason McDonald2012-04-192-3/+12
| | | | | | | | | This test has four stable failures. Mark those with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25297 Change-Id: Ic5304443c4467c46f70ef033c8f17d7f3732294c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove insignification of qsocks5socketengine on Ubuntu 11.10Jason McDonald2012-04-192-1/+10
| | | | | | | | | | | The test has one stable failure on CI, but that failure is not observed by all Ubuntu 11.10 users. Mark that failure with QEXPECT_FAIL when it is going to fail and re-enable the test, following the pattern established for the qtcpsocket test on this platform. Task-number: QTBUG-23380 Change-Id: Ic7546595f314c55ebd36957ada92978141a1c509 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove Q_WS macros from qwidget-test.Friedemann Kleint2012-04-191-387/+184
| | | | | | | | | | | | | | - Remove Q_WS-ifdefed sections and switch by platform name instead. - Remove Q_OS_IRIX and Q_WS_QWS conditionals - Fix deprecated QPixmap::grabWidget(), QPixmap::grabWindow() calls. - Use QTest::qWaitForWindowShown() instead of qt_x11_wait_for_window_manager(). - Rewrite some platform-specific code using QPA interfaces. Change-Id: I29ce4c4f3e5c05edddfd018dc2eabdd77738eb23 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add test case for checking ConnectInBackground is setShane Kearns2012-04-191-1/+64
| | | | | | | | | | | | | ConnectInBackground should be set when opening a network session due to a background request. This test checks that. Unfortunately, none of the bearer plugins currently in Qt Base support this attribute, so the test result is inconclusive. (testing with a debugger shows the attribute is set correctly, but it can't be read back as the set is discarded by the plugin implementation) Change-Id: Idcf777fe489a62d4ff5007ffd291a84ba052311b Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Abort background requests if policy changes to disallow themShane Kearns2012-04-193-9/+110
| | | | | | | | | | | | | Using the policy change signal from QNetworkSession. If the new policy disallows background requests and this is a background request, then generate an error. This results in a TCP RST on the socket, and a BackgroundRequestNotAllowedError on the QNetworkReply. If the reply is already finished, no action is taken. Change-Id: I4ff5c681a8b7b852727bb95f03664d666f4efe07 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Expand tst_QNetworkReply::backgroundRequest to ftp & httpsShane Kearns2012-04-191-5/+35
| | | | | | | | Ftp and Http have different implementations of QNetworkReply, so test both of them. Change-Id: If502fa1788110edf89e619966534eea08830a19b Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Connect usagePoliciesChanged signal to the QNetworkReplyShane Kearns2012-04-194-0/+20
| | | | | Change-Id: Ibb8ba0b3226e402dfa9a5a1a64faa80702b11dd7 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Set ConnectInBackground also for http implementationShane Kearns2012-04-191-1/+3
| | | | | Change-Id: Id82322250d86f35702036c64d725c9d093046d5b Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* fix static library names when generating .pc files for pkgconfigMark Brand2012-04-191-1/+2
| | | | | | | | | 219a688ac17052e4bb3aac9ff8a813e3f4d8da01 added the version extension which only occurs on the DLL import library. Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Hib Eris <hib@hiberis.nl>
* Add a manual test for the window geometry.Friedemann Kleint2012-04-195-0/+580
| | | | | | | | | Test positioning QWindow and QWidget (frame / normal geometry) for testing QPA plugins. The test can be built with Qt 4 for comparison. Change-Id: I695bf28d5fdf738262d322518d01ad04aa5056f5 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove insignification from QMenuBar test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | This test hasn't failed in the last 400 CI builds. Task-number: QTBUG-4965 Change-Id: I2ff03b7a12906a2b583b3127bf47c12b901ed319 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Removed legacy pixmap and image cleanup hooks.Kim Motoyoshi Kalland2012-04-192-25/+0
| | | | | | | Task-number: QTBUG-25114 Change-Id: Id87172665ec15874e293e3891738e6366aef4554 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* fix qsslsocket build in -permissive mode (assigning const char* to char*)Konstantin Ritt2012-04-191-1/+1
| | | | | Change-Id: I76269630ebabdf601c2fcb5f65a8dffbd6cdbc5e Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix detection of default platform plugin.Girish Ramakrishnan2012-04-193-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in qconfig.h. This allows us to override the platform name using a configure argument. This commit adds -qpa <platform> that lets the user specify the default platform at configure time. Note that the default platform is not checked against the tree since plugins are allowed to exist outside the Qt source tree. In the absence of -qpa argument, configure checks the mkspec for a variable named QT_QPA_DEFAULT_PLATFORM. This check is implemented only in the unix configure because it will be primarily used in custom mkspecs (devices, boards). If -qpa argument is absent and the mkspec variable is absent, the default value is determined based on the OS as below: Unix - "xcb" Windows - "windows" Mac - "cocoa" QNX - "qnx" Done-with: Jørgen Lind Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed QSimd WindowsCE buildBjoern Breitmeyer2012-04-191-1/+8
| | | | | | Change-Id: I94de251cf1f283d30f92d0fb9d37a1646765cbdd Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>