summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Exclude helloconcurrent when QtConcurrent is not configuredSamuli Piippo2012-02-061-1/+1
| | | | | | | Task-number: QTBUG-23874 cherry-picked from qtbase c8156cab81690526adffa22214657fc1c6563b8b Change-Id: I371a3eb3f4145d80e9f51fe89d61bac5c269d587 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-062-0/+4
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* JSCore build fix for WEC7jaanttil2012-02-061-0/+11
| | | | | | | | | | WEC7 does not have std::ptrdiff_t type and std::min/std::max, introduced the missing types and functions in JSCore platform.h Task-number: QTBUG-22497 Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixes to JSCore for WinCE.jaanttil2012-02-061-9/+9
| | | | | | | | | | Moved WINCE specific code before desktop windows code. This is needed because in WinCE both OS(WINCE) and OS(WINDOWS) are true. Task-number: QTBUG-22502 Change-Id: Icf9ad1a155dc705e37e5e057bb23bc7f5c2d4931 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixed QtDeclarative autotest deployment for WinCE devices.jaanttil2012-02-0661-61/+134
| | | | | | Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed cetest build for Windows CE.jaanttil2012-02-061-1/+3
| | | | | | | | | | | | The bootstrap configuration for cetest was missing a few dependencies which broke the build. Added the missing dependencies to cetest bootstrapped.pri. Task-number: QTBUG-22505 Change-Id: Ibf966f9855f7eb8a7e561ea570c17ff447aa057d Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix 3 autotest build faulures for WinCEjaanttil2012-02-063-1/+4
| | | | | | | Change-Id: I67af7b1b31be3c6d99abf2344bcfd93fd5f77bf6 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Build fix for QtDeclarative in WindowsCEjaanttil2012-02-061-0/+7
| | | | | | | | | | | | | | | | | | | qdeclarativestateoperations.cpp in declarative module needs to include qgraphicsitem.h. In windows CE, the qgraphicsitem.h further needs to include qfunctions_wince.h. qfunctions_wince.h is used to implement posix functions missing from WinCE. One of reimplemented functions in qfunctions_wince.h is posix rewind. Now qdeclarativestateoperations.cpp also implements method called rewind with different prototype. Two incompatible prototypes of rewind break the QtDeclarative build for WinCE. As a workaround the POSIX rewind reimplemented by qfunctions_wince.h is now undefined in this class, because it is not needed here. Task-number: QTBUG-22511 Change-Id: I9e569fa753e70b386068f54d95c3aae0a2dbe55d Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Ensure that the type is not registered as a typedefAndy Shaw2012-02-061-1/+1
| | | | | | | | | | | | When qRegisterMetaType() is given a dummy parameter as 0 then it will try to register it as a typedef and not a type. Changing it to be -1 for the dummy parameter will ensure that it is not registered as a typedef. Task-number: QTBUG-18555 Change-Id: I18606bb1e53a334256658cc5b8d8a13c0d6617a1 Reviewed-by: Martin Petersson Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Make copy and cut methods work in QAccessibleTextEditJosé Millán Soto2012-02-062-3/+16
| | | | | | | | Correct the implementation of cutText and copyText in QAccessibleTextEdit so they use cut() and copy() methods of QTextEdit Change-Id: I86a531ed7059b1a928cb8515c2743d4d8b596b36 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Do not check isActiveWindow to determine if an accessible widget is focusableJosé Millán Soto2012-02-062-3/+3
| | | | | | | | | QWidget::isActiveWindow() was being checked in QAccessibleWidget::state to determine if a widget is focusable. As a result, focusable widgets were reported to be not focusable when the window was not active. Change-Id: I765eddca859d859d19d31bd2e9ffe3b132a1a4ef Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Add support for QNX iconv implementation.Rafael Roquetto2012-02-034-3/+9
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: fix tst_QFile::rename() autotestSergio Ahumada2012-02-031-1/+1
| | | | | | | | | This test was incorrectly assuming that a file named "Makefile" exists. Change-Id: I318b12f67e0476d6f08d1fc86194ca96f2bdb373 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from commit 227cb8c0b91f9e88e53432b3936cd1fc4f90e9f7) Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fixed DEBUG macro redefinition when compiling for WEC7 with MSVC.jaanttil2012-02-031-11/+11
| | | | | | | | | | DEBUG macro is defined from command line for debug builds in WEC7. Changed graphcisscene internal macro to have different name. Task-number: QTBUG-22512 Change-Id: I3d2bb8b7a2741fe34397a1c3cc268c1f6c5593b3 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed compiler warning about unused status argument.jaanttil2012-02-031-0/+1
| | | | | | | | | Task-number: QTBUG-22512 Change-Id: I6894259faa3af6171a3f5313357d222e45b48af3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed warning by MSVC about class/struct mismatch in MethodData.Janne Anttila2012-02-031-1/+1
| | | | | | | | | | | MSVC reported the following warning when compiling declarative module: 'MethodData' : type name first seen using 'class' now seen using 'struct' Fixed by changing the forward declaration from class to struct. Task-number: QTBUG-22512 Change-Id: I066feea80115d1d968332933d78e0408cd92a70a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Reduces compiler warnings when compiling for WEC7jaanttil2012-02-038-2/+13
| | | | | | | | Task-number: QTBUG-22512 Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed qchar and qsvgrenderer autotest deployment for WinCE devices.jaanttil2012-02-032-2/+7
| | | | | | Change-Id: Ibac9f5878ea1ec2a7d13868e5e60f1d6e7aa3d36 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Adds QT_NO_QWS_INPUTMETHODS to blackberry qcc mkspecsRafael Roquetto2012-02-032-0/+4
| | | | | | | | | | This prevents QApplication from setting a dummy input context, overriding the one set by the BB QPA plugin. Change-Id: Ie18e06d091d5d8748f3f253b0092ac725639cde1 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Take into account shaping in findRealWindowAlbert Astals Cid2012-02-033-3/+38
| | | | | | | | | | | | It can happen that there is a window covering all the screen but it is shaped to only take part of the screen. If that happens, besides the condition of QRect(attr.x,attr.y,attr.width,attr.height).contains(pos) we also need to query the server for its region rectangles and make sure the cursor is inside one of those rectangles. If that does not happen we have to return 0 so the hierarchical XQueryTree search continues Change-Id: Icb2204a50197e4a5e02e75601c67287525b290b0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix progress bar values >100% when http upload is retriedShane Kearns2012-02-032-1/+2
| | | | | | | | | | | | | | | | If a http upload (PUT or POST) fails, the IO device is reset and the upload is retried a second time. Now we also reset the progress counter in the wrapper class QNonContigiousByteDevice. That way the progress bar goes back to 0% and stops at 100% Previously if the 1st attempt failed at 20%, the progress values would carry on from 20% and finish at 120%. Task-number: ou1cimx1#970373 Task-number: QTBUG-23993 Change-Id: Ifc9963595113cf3001ed45f94f525e2305ad479b Reviewed-by: Markus Goetz <markus@woboq.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix pinch-zoom problem when application is deactivatedJarkko T. Toivonen2012-02-032-3/+11
| | | | | | | | | | | | | | | | | | Deactivation can happen for example if some notification dialog opens on top of the application. In this case the PinchFinished signal was not emitted. It is fixed so that when the QDeclarativePinchArea component receives QEvent::WindowDeactivate event, the ongoing touch activity is cancelled, which causes the pinch to finish. Also if QEvent::TouchUpdate event is received without receiving QEvent::TouchBegin event first, the QEvent::TouchUpdate event will not cause the updatePinch() method to be called. Task-number: ou1cimx1#948030 Change-Id: Ib8b9e1a022415be06f1a8e778b887418f32c75ef Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* QTextEdit cursor position fix when moving left/right with selectionPasi Matilainen2012-02-033-10/+24
| | | | | | | | | | | When text has been selected in a QTextEdit and the left or right arrow key is pressed, the cursor moves one character beyond the start or end of the selection, when it shouldn't move past the selection. Fixed by moving the cursor to the right place when a selection is active. Task-number: QTBUG-22853 Change-Id: I9ea1863436db98627a6fd041ce554cf10be26493 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Make QMacCocoaViewContainer work again.Morten Johan Sorvig2012-02-031-0/+3
| | | | | | | | | Non-native widgets are now the default, set WA_NativeWindow to get a native widget. Change-Id: I39a4d3476d8cf2470035ff94feac7a20232dc8e1 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* test: Split `qsqlquery' unit and benchmark testSergio Ahumada2012-02-037-38/+290
| | | | | | | | | | | | Moving benchmark test from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void benchmark(); was moved to 'tests/benchmarks/sql/kernel/qsqlquery' Change-Id: Icbe88fecdfe24a7754079451f635f9c19b3d6683 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Split `qcontiguouscache' unit and benchmark testsSergio Ahumada2012-02-035-138/+197
| | | | | | | | | | | | | | Moving three benchmark tests from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void asScrollingList(); - void cacheBenchmark(); - void contiguousCacheBenchmark(); were moved to 'tests/benchmarks/corelib/tools/qcontiguouscache' Change-Id: Ie6ca7f55db2a218f3ccf699744cb721a8a1e2363 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Check for the clipboard manager when looping due to app quitingAlbert Astals Cid2012-02-022-3/+9
| | | | | | | | | | | | | | One can be extremely unlucky and on session logout get this: * All apps are going down * A Qt app checks if the clipboard manager is there to yield its clipboard contents * The clipboard manager is still there * Then just after that check, the clipboard manager finishes because of the session end * This means the Qt app will loop for 5 seconds trying to yield its clipboard contents to a clipboard manager that is not there anymore This is a backport of 689c4009fb9be348f9137a9092b068e056a3d8b3 in the qtbase (Qt 5.0) repo Change-Id: I8ab1f460aa5936c03f1afc1b6ff18824f1d6cbc1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Enable basic gesture support for WEC7.Miikka Heikkinen2012-02-022-2/+2
| | | | | | | | | | | | | | This commit adds basic gesture support to WEC7 Qt builds, which enables developer to create custom gesture recognizers based on mouse events. Note that QTouchEvents are not yet generated in WEC7 Qt builds, so recognizers based on those cannot be created. Task-number: QTBUG-22517 Change-Id: I2588eabdaefc52123d579b47ebc9903d988c4b3a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update Offline CSS stylesheet.Casper van Donderen2012-02-021-3/+5
| | | | | Change-Id: I60eba75aac0d70b1f4a6342e623b13db2c5b826f Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Windows configure: make -mp affect the Qt build itselfJoerg Bornemann2012-02-021-3/+4
| | | | | | | | | | | Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I2f9f038ae64acec545fcd038842bba92a8736af4 (cherry picked from commit 41a5ca35591a735d9f07e2335d5827763d52c1f4) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Prevent data loss when an ssl socket is closed by remoteShane Kearns2012-02-022-13/+22
| | | | | | | | | | | | | SSL context was destroyed on disconnect. This makes it impossible to decrypt buffered encrypted data. So if there is encrypted data in the receive buffers, then don't destroy the ssl context until the socket is destroyed. Task-Number: QTBUG-23607 Change-Id: I16a7b4fa006647ec73049c90cdbc72686696850f Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit c5aba0ac17ae6ed8f3847bd30325acdbd1ecaa80)
* Change QUrl::toLocalFile to return path for relative urlsAapo Haapanen2012-02-022-4/+13
| | | | | | | | | | | | | | | | | | This change reverts the behaviour of QUrl::toLocalFile to the state it was before 4.8. After this change the function returns the path if the url is relative. Before this change an empty QString was returned. A relative url can refer to a local file, but that can't be determined from the url alone. Thus, it makes sense to return the path for such urls. Added documentation to explain that the function works like this to maintain backward compatability in 4.x, but the handling of relative URLs will change in 5.0. Task-number: QTBUG-19827 Change-Id: I8bb8f4603a5936c0359afc1b6ff98824fad6cbc9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix a crash when changeEvent() is called and there is no containerAndy Shaw2012-02-021-1/+1
| | | | | | | | | | | When changeEvent() was called and no container had been set up then it would crash because it uses container without checking if it exists. Task-number: QTBUG-23957 Change-Id: I67393bf5c9bc5b437b92ee2c1b72ffbd5cd12af3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit c36006f45fdcbdb97cbc3179c4ecc25203898fc5)
* Add support for XCode 4 into qmakeAndy Shaw2012-02-022-73/+172
| | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Disable qmlplugindump build for WinCE.jaanttil2012-02-021-1/+1
| | | | | | | | Task-number: QTBUG-22518 Change-Id: Ief49bcc0895ad70bf2677b03a92caaa78b599340 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Add accessible role Terminal.Frederik Gladhorn2012-02-021-0/+1
| | | | | Change-Id: I7359f4abbfc387e88845e6046d43ec1ce97bfc47 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fixed compiler warnings about unused q and d variables in declarative.jaanttil2012-02-023-3/+0
| | | | | | | Task-number: QTBUG-22512 Change-Id: I9acde5b799aa12c9de6e3321003bd5dcc4bb853d Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Fixed crash in QDeclarativeGridViewMartin Jones2012-02-021-1/+1
| | | | | | | | Inserting new items used a different threshold than removing items outside the view in refill. Change-Id: Id3605122a7a31caf0b661e78b5d868ceb3f01e20 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Make configure not complain about missing perl for non-dev. builds.Markku Heikkila2012-02-011-5/+11
| | | | | | | | | Fixed so that configure.exe is consistent with unix configure. Task-number: QTBUG-5710 Change-Id: I74f35ea269e9ca6648866542a2bd1a15cda09ac0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Symbian: clean deffiles for external projects using Qt infixPasi Pentikainen2012-02-011-1/+2
| | | | | | | | | | | When external projects use the infix configuration of Qt (QT_LIBINFIX), they can make their own library targets infixed. This fix cleans the infix from deffile names for such projects also, as long as the project defines variable QT_LIBINFIX_USED. Change-Id: Ifaf773c60d1ebe6f947f1cd44b76428de1c23dbf Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Skip tst_QEventLoop::deliverInDefinedOrder_QTBUG19637 on SymbianGareth Stockwell2012-02-011-0/+3
| | | | | | | | | | Temporary workaround for QTBUG-23974. This change allows the test suite to run to completion, and is required in order to allow some new test steps, prepared for addition following this change, to be executed. Change-Id: I96c9d8e76646625deb69143a434ed9a186623c72 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix crash in QTreeWidgetItem::sortChildren when adding new item.Markku Heikkila2012-02-012-0/+33
| | | | | | | | | | | | | | | | Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and sorting is enbled in QTreeWidget. First call is from user code and second is caused by timer. When timer expires second call is made. This recursion is prevented with QTreeModel::SkipSorting skipSorting() in QTreeWidgetItem::sortChildren(); Task-number: QTBUG-20345 Change-Id: I48af98b03c0291de8da90d1581bc55cc89846b8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* qt demos and qt examples config in symbian package definitionRoy Mickos2012-02-011-1/+1
| | | | | | | | | Symbian package definition has been changed so that the build filter definition in package_definition.xml is identical. This allows them to be built in a separate build phase. Change-Id: Ie29f2358a6c6d796a32b78d9439ed899c43a49ad Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Fixed libjpeg compiler warning about macro redefinition.jaanttil2012-02-011-1/+1
| | | | | | | | | | When compiling Qt for Windows CE the MSVC reported the followin warning: warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed MSVC compiler warning for zlib when compiling on WEC7.jaanttil2012-02-011-2/+6
| | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard to zlib when defining _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed compiler warning for libpng when compiling for WEC7.jaanttil2012-02-011-1/+3
| | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard for libpng '_CRT_SECURE_NO_DEPRECATE' macro definition. Task-number: QTBUG-22512 Change-Id: I41a7a0500b0f44984f35e4d7d6be9adb02c12b33 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fix delete/free mismatch in QtXmlPatternsSami Rosendahl2012-02-011-1/+1
| | | | | | | | | | | | | | Fixes valgrind warning like this: Mismatched free() / delete / delete [] at: operator delete(void*) (vg_replace_malloc.c:387) by: QPatternist::Decimal::toString(double) (qdecimal.cpp:121) Reason for the warning is that toString above calls qdtoa the result of which should be released with free(), not delete. Change-Id: I5ed04a67b91ca5270e28cb2b244612d2b0c437ac (cherry picked from commit 900091e51ead9594d0b1f513cabeba0ebc067dce) Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Escape path names in qmake-generated Makefiles.Andreas Hartmetz2012-01-311-1/+1
| | | | | | | | | | | | | qmake-generated Makefiles since 4.6 (according to bug report) contain recursive qmake invocations with absolute paths to .pro files, where the absolute paths are not escaped. This is a backport of ea2c9f764fed654a57972223449f41e208e05863 from qtbase master. Task-number: QTBUG-11776 Change-Id: If926fe4f2ee4c0e72e140c0fcc376e5a0fd20f21 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed QFile::link behaviour for WinCE devices.jaanttil2012-01-311-0/+1
| | | | | | | | | | | In WEC7 both arguments given for ScCreateShortcut needs to be given in Windows format. Apparently older WinCE devices has accepted also Unix format but this is not anymore true for WEC7. The Windows format works for older WinCE versions as well. Change-Id: Ibea55c5fd8d5a981cdb06e34a20c369bf3b53200 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Various Qt documentation fixes (wk 44)artoka2012-01-3113-18/+28
| | | | | | | | | | | | | | | | Task-number: QTBUG-13362 Task-number: QTBUG-18356 Task-number: QTBUG-18417 Task-number: QTBUG-18664 Task-number: QTBUG-21562 Task-number: QTBUG-22094 Task-number: QTBUG-18741 Task-number: QTBUG-15921 Task-number: QTBUG-22172 Task-number: QTBUG-15738 Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>