summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Widgets: avoid integer divide by zero in QProgressDialogLiang Qi2013-05-152-0/+19
| | | | | | | | | | | Autotest is included. Task-number: QTBUG-31046 Change-Id: Ief7d71b58e7a5416f3659f19445e5d729849b3b6 (cherry picked from commit 69c05bbef47fb9d30d70e594bd5942add8b135fe) Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* BlackBerry: Revised error handling in event dispatcherBernd Weimer2013-05-151-40/+42
| | | | | | | | | | | | | Added an upper bound check for socket notifier file descriptors. Too high FDs have been a real source of failure. Added compiler hints to allow error-free code path run faster (errors are highly unlikely) and adjusted warning messages (some were misleading and too long). Backported from qtbase: ebd5de1 Change-Id: Ib982f853ee803447bdcaf22aed310697a36b4ccf Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Backport qmlRegisterUncreatableType with version templateAlan Alpert2013-05-151-0/+45
| | | | | | | | Otherwise it is not possible to extend or add uncreatable types safely. Change-Id: I22e81bb46a69efcec3522454d5ad465099b2555b Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Disabling largefile support for WinCE.Bjoern Breitmeyer2013-05-131-0/+1
| | | | | | | | | | | | | This was disabled before, but 2bba0eadc1570f29331285738b9d319687f84d4c enabled it per default. Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06 (cherry picked from commit 45750b18187ef257a986cf6ab8b2c97ef3ba6e52) Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake/vcxproj: resurrect support for /we compiler switchJoerg Bornemann2013-05-133-1/+8
| | | | | | | | | | | | | The vcxproj format supports the /we compiler switch as TreatSpecificWarningsAsErrors tag. Support for this switch got lost during refactoring of the vc(x)proj generators for Qt 4.8.0. Task-number: QTBUG-29098 Change-Id: I607e907dcb9c1bc7d261053b6d757941ec7db822 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit a3d1d41d1d88b989fe7c460ef32b4f8606aafe0c)
* qmake/vcxproj: fix parsing of /RTC* optionsJoerg Bornemann2013-05-132-14/+30
| | | | | | | | | | /RTCsu and /RTCus must be handled as full runtime check options. Task-number: QTBUG-30711 Change-Id: I783bf49f2ab1d4fd9636dca8e434bccb54844c8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 3c62f4d0c65f1a60bd8d4e6b985d79cb0aa8342b)
* test: Mark tst_qsharedpointer as insignificant only on Mac OS XSergio Ahumada2013-05-121-1/+1
| | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTBUG-31100 Change-Id: I925accd0637250ba8e7a0173c51a2171b4e960b3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Special-case the forward declaration of STL types for libc++.Raphael Kubo da Costa2013-05-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is somewhat of a follow-up to 5210d47aa66214e3cb16f394d0510a91f770c1b1. libc++ declares the STL types in an inline namespace within the "std" one if clang is used. If one includes a header such as <iterator> before a Qt one and builds with QT_NO_STL, the following ends up happening: // <iterator> namespace std { inline namespace __1 { struct random_access_iterator ... ; } } // qiterator.h #ifdef QT_NO_STL namespace std { struct random_access_iterator; } #endif qiterator.h's declaration shadows the original one, and the compiler complains random_access_iterator lacks an actual declaration. Solve this by checking for libc++ and forward-declaring the iterator types we need within the same inline namespace. Not backported from qtbase because QT_NO_STL does not exist in Qt 5. Change-Id: I6742d540f6538a30aa060a4447c288cfb9cd781d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* test: Remove insignificant_test from tst_qaudioinputSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I51df22c00d4e13a0b83230bc25e1b810ed183539 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicsscene as insignificant only on Embedded (QWS)Sergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux, Windows and Mac OS X. Change-Id: I994fe4c69c3520fe1eabf2d92224c8dd040ba3d9 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qdbusmarshallSergio Ahumada2013-05-111-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Change-Id: I19f1b4bd4969bf9e396d696a273d214af16ebd9a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qgraphicsanchorlayoutSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: Idd094cdbc2a21f3e5840366f8f47b9a187331023 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicsanchorlayout1 as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I6f21bf40d93adc8e359cf9fa0feea7fd4140736e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qgraphicswidget as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ie658d90cbc9eb2b68a963b1f1de06ca37f44047e Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qinputcontext as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ib1d44ce284e3d0dcfa539376928cb41516a2059a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qitemdelegateSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I06b659a750dcc76858287eb8336aa5228298d6e5 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qmacstyleSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I421a7f541e24f1f1ebad8a68cc599bbdd38a767a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qpainter as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I7b92c105bfa4fc00c92a00d4d731cabc878bb073 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qscriptextensionpluginSergio Ahumada2013-05-111-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: Icd24090b782738c3ab2635d41560eaf0d6b7ba1a Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qsettings as insignificant only on WindowsSergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I9dfc0c5b79a019e70fba04502050b35997384928 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qstylesheetstyle as insignificant only on Mac OS XSergio Ahumada2013-05-111-1/+1
| | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: I7a3001381df805c9424b694197a92b467d69c1bc Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Fix jump and property changes on first move when dragging a Flickable.Andrew den Exter2013-05-113-6/+12
| | | | | | | | | | | | | | | Fixes a regression whereby on the first mouse move the contentItem was moved the total distance from the touch point to where the drag distance was exceeded. For large drag thresholds this causes a noticeable jump. Task-number: QTBUG-30032 (cherry picked from qtquick1 3a80424aeae19e838be03aa12a5243911ec3f020) Change-Id: I92c119d27dc2e22203484f9ada5978697d171957 Reviewed-by: Martin Jones <martin.jones@jollamobile.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Check that 3DNow! instructions are supported before including mm3dnow.h.Raphael Kubo da Costa2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX instruction headers: by checking that the compiler is set to support those instructions besides verifying that QT_HAVE_3DNOW evalues to true (which only means the compiler supported them when the build was being configured). This has not caused a problem in most cases so far because GCC protects its mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check and can fail if -march is set to, for example, i386 or i486. Not backported from qt5 because qtbase because qsimd_p.h does not include the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ukrainian translation updateVictor Ostashevsky2013-05-105-14/+8
| | | | | | | Tiny fixes, mostly about copyright years. Change-Id: I9223eaabccb1ce93f1688f3512344dbcfb05aa6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix clang warning about bool to pointer conversion.Jędrzej Nowacki2013-05-102-2/+2
| | | | | | | | | | | The operation is legal from C++ perspective but only for "false" as it is guaranteed to be 0. Anyway returning 0 instead of "false" is logical and it follows coding style used in the modified functions. (cherry-picked from qt5 commit 50995e6936c5ca75a0a8a48c29bbbedd2cc60567) Change-Id: Ia09758e8d28599097f5c40eb24722890508afdbc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_memberSergio Ahumada2013-05-081-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Change-Id: I526a92a2bd94fff03b58f63df0119db0d124ba18 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qtableview as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I4e1a95d66596b29a926a92dae325fd2fbb114d81 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qtimelineSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platforms. Task-number: QTQAINFRA-574 Change-Id: I6a536c7c4c33817544bff1d933d6f4a05f1631c2 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_qwizard as insignificant on Windows and Mac OS XSergio Ahumada2013-05-081-1/+1
| | | | | | | This test has been passing lately on Linux. Change-Id: I3c7e5cf4214899a65f4eccd15a0fd49e822675d8 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Mark tst_xmlpatterns as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I507a6b4220a3e3ded7bcfed2aded1e15bf53958a Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* test: Remove insignificant_test from tst_qlocalsocketSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platform Change-Id: Ib16a0e1e914ae85271f751f66bdece7e4ec851b6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_qsocketnotifier as insignificant only on Mac OS XSergio Ahumada2013-05-081-1/+1
| | | | | | | | | This test has been passing lately for Linux and Windows. Task-number: QTQAINFRA-574 Change-Id: Ic4d96c3645d6d10227ad1ce957f27a2079e9b834 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Remove insignificant_test from tst_qsocks5socketengineSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: I0d669849e0b17f42e78c1864ea3ba9f070560093 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_qtcpserver as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I5c4cbea784af6e879ccd6a02aaf77f9debad594f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Remove useless insignificant_test mark tst_qudpsocketSergio Ahumada2013-05-081-2/+0
| | | | | | | | The mark is actually in qudpsocket/test/test.pro Change-Id: I4b4d9843b5643e15d988ceabfb9abca4f8cf77a2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_staticSergio Ahumada2013-05-081-2/+0
| | | | | | | | This test is now passing on all CI platforms. Change-Id: Ia3f4e9dd863e04758e1c794f29142e4417d044d2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Remove useless insignificant_test markSergio Ahumada2013-05-081-2/+0
| | | | | | | | The mark is actually in qnetworkreply/test/test.pro Change-Id: I391c3863b6a98f485b8e6b585f346bf06820999e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Remove insignificant_test from tst_qhttpnetworkconnectionSergio Ahumada2013-05-081-2/+0
| | | | | | | | | This test is now passing on all CI platforms. Task-number: QTQAINFRA-574 Change-Id: I8a08beef2f9876d88b7b903cda445ec5decce706 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* test: Mark tst_qnetworksession as insignificant only on WindowsSergio Ahumada2013-05-081-1/+1
| | | | | | | | | This test has been passing lately for Linux and Mac. Task-number: QTQAINFRA-574 Change-Id: I6ed79e9bf166a17226b3196a90b47a3fd48912b2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Compile in C++11 mode: narrowing conversion problemsThiago Macieira2013-05-071-2/+3
| | | | | | Matches qtbase commit a13b17e42a7ca146ec9503285df546d4ade22c91 Change-Id: Ie554499f40c03c715d527f2c1624b97fafe5ce8c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Make QContiguousCache with zero capacity not crashThiago Macieira2013-05-072-0/+27
| | | | | | | | | | | These containers don't make sense and will just result in no action being taken (all items added will simply be discarded), but it shouldn't crash due to a division by zero. Task-number: QTBUG-27339 Change-Id: Ib9acf5c0a9a826e6853e7beaf5e56511fde98dc6 (cherry-picked from qt5 commit 320c4e31e124f99601399d00935362b587c77510) Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Don't bypass overwritten [set]data() methods in the proxy.Volker Krause2013-05-062-4/+28
| | | | | | | | | | | By calling itemData() of the source model directly, the result cannot contain data provided by the proxy model itself. The base class implementation however will call data() on the proxy instead. Cherry-picked from qtbase/96e3c2bcbfedc8b5cb8fc099229a02a1fa335c21. Change-Id: I7e8b65ab045382089c577d9832edc1555b71419e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make Qt 4.8 also compile with the LSB SDK on LinuxThiago Macieira2013-05-062-8/+8
| | | | | | | | | | | Generate worse code. This is similar to Qt5 commits 46bfd84fdc24fa3e3e721a5dda6cfbebe75be073 and c69106d1bf66d64e046c4f639542457151187dfc. Task-number: QTBUG-25336 Change-Id: Idd61c23d2b528db9d8c7895df008b9c1b0e2a2a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix QtScript crash on 64bit with JIT.Friedemann Kleint2013-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | During back-trace generation we calculate a code offset towards JIT generated code. Using JITCode::offsetOf() will crash/assert if the offset doesn't fit into 32 bits, because the generated code can only encode relative offsets in 32-bits and not 64-bits. However in this context - backtrace generation - we just want to calculate the offset and are not interested in this architectural limitation, therefore we can just calculate the offset ourselves using the fully sized uintptr_t. Initial-patch-by: Simon.Hausmann@digia.com Task-number: QTCREATORBUG-8629 Task-number: QTBUG-23463 Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from qtscript/3b26f6f6643978c9d041a6267dc88e2a59ced763) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QLocale: Add fr_MA localeEl Mehdi Fekari2013-05-033-904/+924
| | | | | | | | French_Morocco locale was introduced in CLDRv22.1 and already exists in Qt5 Change-Id: I4f0452f421cf074eb2c4fae22351d430d5f02e42 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* make sure qmake finds itself in CWD on windowsOswald Buddenhagen2013-04-301-0/+1
| | | | | | | | | and consequently that it finds qt.conf. Task-number: QTBUG-30583 Change-Id: I48441477e941d9609270d6e5e1b405127c0c0aca Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/e7c3b21b7c1ed9247cb2f9eeddc154534a038549)
* Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Cherry-picked from qtscript/c85662167123b433a69a662212c67ce03e44a25a. Change-Id: I21ee882961264d131cebdee04cb641c0d0de3d18 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fixed -dbus-linked when cross-compiling from WindowsMatt Fischer2013-04-291-2/+6
| | | | | | | | | | | | | | | | Since Windows doesn't have pkg-config, it doesn't get -ldbus-1 added to the command line automatically like Linux does. Code was present to deal with this case, however it was only configured to work when native-compiling Qt. The flag was not added when cross-compiling, meaning that -dbus-linked did not work correctly in that case. This patch changes the code to add the flag properly in both cases. Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9 Task-number: QTBUG-29984 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix QPluginLoader-test.Friedemann Kleint2013-04-293-56/+98
| | | | | | | | | | | | | Set correct working directory on Windows, do not create app-bundle on Mac. Changing numbering of garbage libraries to 1..5. use test data and and check for 'real' error message as well as plugin cache message. Set a fixed target for the test plugin, omitting debug suffixes on Mac and Windows. Change-Id: Ia2bf826d117ec346915de4cb24b16f8b6d61d579 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Revert "JSCore build fix for WEC7"Janne Anttila2013-04-291-11/+0
| | | | | | | | | | | | | | | | | | | | I's reverted, because there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. The same patch is reverted for Qt5 as well: https://codereview.qt-project.org/25482 This reverts commit 1fba05343eb6fea40f6617a62e31e10a0e918ec2 Change-Id: I956cc6f0669c67a094a2af464f8aa719a137a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>