summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-0111585-23285/+23316
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: Re-enable tst_QMdiArea test.Sergio Ahumada2012-08-012-1/+4
| | | | | | | | | The test has one stable failure. Mark this with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26726 Change-Id: I7b59609f71d35af27b56f62eedc9bbef4adb7f65 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* [Blackberry] Set default platform name for QPARafael Roquetto2012-07-302-0/+4
| | | | | | | | | | | Set the default platform name/plugin to be 'blackberry' when building for BlackBerry devices. qtbase ref: 5430d1de Change-Id: Id2b3263fd9e1b2214751c3c4d75b8991599926e5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add defaults for Blackberry platform on configureRafael Roquetto2012-07-301-0/+25
| | | | | | | Adds default values for Blackbery platform configuration on configure.exe. Change-Id: I11e4f7135d88fcc6133194d6a82863ae494c8c82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Accessibility: fix updates for models with rootIndex set.Frederik Gladhorn2012-07-301-6/+12
| | | | | | | | | The accessible table/list implementation would ignore when a root index is set, resulting in trying to use row/column for the top level index, leading to accessing invalid indexes. Change-Id: I2568522053bafe48458446dd2f47b68d98d634aa Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40Simon Hausmann2012-07-305-2/+11
| | | | | | | | | Prospective build fix for Mac OS X Mountain Lion Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be Reviewed-by: Mike McQuaid <mike@mikemcquaid.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Check for 0 before accessing the pointerLars Knoll2012-07-301-0/+3
| | | | | | | | | | | | Fixes some reported crashes where we get into qt_tokenize() with a 0 pointer. Not relevant for Qt 5, as qt_tokenize() doesn't exist there. Task-number: QTBUG-26247 Change-Id: I1cc5c5b514c1c35dfee318ad4d37a54deffc5d53 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Workaround tst_headers, especially the license header checkSergio Ahumada2012-07-301-11/+37
| | | | | | | | | This is a temporary solution to enable the license header test. All license headers need to be converted following Qt5 Change-Id: Ic96c0fd783aedc4aa4fefaa4eb816e75cd07f742 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix duplicate mouse event being sent for LinuxInput touch eventsRomain Pokrzywka2012-07-291-1/+1
| | | | | | | | | | | | | | This is due to the X and Y messages being received before the TOUCH one, followed by a SYNC message which then creates the second mouseEvent. The event should actually be sent on the SYNC message, so remove the one sent from the TOUCH message handler, just set the posChanged flag. For more details see: http://www.kernel.org/doc/Documentation/input/event-codes.txt Change-Id: I30e71fc3e7da24d8e698467b4d6e0bcd5a64eb37 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QUrl: document that setIdnWhitelist isn't thread-safeMarc Mutz2012-07-281-0/+3
| | | | | Change-Id: Ia77a211f1d670d81b2a4783693ed09533d53eceb Reviewed-by: David Faure <faure@kde.org>
* Use improved QLibrary search heuristics for SSLSean Harmer2012-07-271-0/+2
| | | | | Change-Id: I3b6b4beedae4323cce5130fd2fcaf2a25c5be5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics for QMeegoRuntimeSean Harmer2012-07-271-1/+1
| | | | | Change-Id: Ibe649c6ca7f3dad96f1e624efdb2051eb724a6fb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics in qgl_x11.cppSean Harmer2012-07-271-0/+3
| | | | | Change-Id: Ie806a4147d2d29eef235dd7cb0ef95b8ecf68e3d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics for libresolvSean Harmer2012-07-271-0/+1
| | | | | Change-Id: Iecd4c19ae6d9c415bca828bf2ea2557f0fb96241 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics for libgtkSean Harmer2012-07-271-0/+1
| | | | | Change-Id: Id9bdb0199f926d1a518a94080285f96f0810cf92 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics for loading libdbusSean Harmer2012-07-271-0/+1
| | | | | Change-Id: I0a8ddb61e573f1e87dbdd0b29f4418beb2d7b494 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics in qapplication_x11.cppSean Harmer2012-07-271-0/+5
| | | | | Change-Id: I9db2572ea2d437ecbba94911e1dfb9d0cb6503a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use improved QLibrary search heuristics for ICU in QLocaleSean Harmer2012-07-271-0/+2
| | | | | Change-Id: Ia39350adbc43ded4faa06885e00eead45261f87f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Introduce ImprovedSearchHeuristics flag to QLibrarySean Harmer2012-07-273-25/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new flag to safely introduce the improved search behaviour in Qt5's QLibrary. If the flag is set then QLibrary will use the following search heuristic. Otherwise the existing behaviour will be used. New search behaviour: If an absolute path is specified we try that first. Otherwise we first try the most likely system-specific format (e.g. libfoo.so) on Unix. This improves performance especially on systems with slow flash devices. For example, prior to this commit loading the Xcursor library (in the xcb plugin) results in attempts to dlopen: "Xcursor" "Xcursor.so.1" "libXcursor" "libXcursor.so.1" With this commit this is reduced to a single attempt of: "libXcursor.so.1" Plugin loading uses absolute paths with QLibrary so there is no performance penalty for plugins with this commit. There will be a follow-up commit to make use of the new flag within Qt to improve performance. This is a backport of 0026b80cd2a484ad9d685ff5a4f89e6c9815f913 Change-Id: I0dbc83c2909713c01dc687ab8cc3cb0619d1500a Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve performance of QLibrary::load()Sean Harmer2012-07-271-7/+7
| | | | | | | | | | There is no need to create a QFileInfo object to split the path and filename. Backport of 503fe0a5b763c4c27cde54befe58e4726cd216f2 Change-Id: I0ce0e6e4cc64639dbfabe233d82b57c91b3055ca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add common build flags required for iOS platform plugins.Ian Dean2012-07-271-1/+1
| | | | | | | Disable QPF & QPF2 fonts and dummy (QWS) input methods. Change-Id: I020f8e9f7e240a7bc4d31a008513e2289bb46f18 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Disable MacOSX 10.6+ locale code for iOS builds.Ian Dean2012-07-271-1/+1
| | | | | Change-Id: Ic2e9437aac10cb23479e8915ff6abf89d6d20169 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* QtDemo: Find installed examples on Windows.Friedemann Kleint2012-07-261-10/+22
| | | | | | | | | | | Add the '.exe' suffix before checking for the existence of the file in the example folder and the 'Debug'/'Release' subfolders. Clean up the code. Task-number: QTBUG-26531 Change-Id: Idd4927558573fe68bf12f98863d0c8848257d3e2 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Set tst_QScrollbar to be significantKalle Juhani Lehtonen2012-07-262-3/+9
| | | | | | | | | | It only fails on Mac OS X Lion. So remove the insignificant flag and set it be expected to fail only on Mac OS X Lion for two test cases. Change-Id: I61a53ae342d6769a76394acaca2581d0b0fd060a Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix qmake hash function to use XORRafael Roquetto2012-07-252-3/+3
| | | | | | | | | | | Use XOR instead of OR in order to avoid saturating all bits when computing the hash value. cherry-picked from qt5/qtbase: 3a27d4b480214072d972ac67561f2ee4010f8baa Change-Id: I582e5b3c42d6436395555a54c6826509d6243ed4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove QtDeclarative dependency from UIKit plugin.Ian Dean2012-07-251-4/+5
| | | | | | Change-Id: I8425b98ecb908b1b912385c3ed2acb9df4b47f2d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Moved CoreText (iOS) font database to shared font database plugin folder.Ian Dean2012-07-254-11/+13
| | | | | | Change-Id: I780e5b12159c078356334f5225f878ec525a8a64 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* MouseArea: use current value of drag.axisAlberto Mardegan2012-07-254-11/+109
| | | | | | | | | | | | | If the drag.axis is changed while a drag operation is in progress, put it into action immediately. This allows, for example, start a dragging operation out of an item in a scrollable ListView to anywhere on the screen. See the linked bug number for an example. Task-number: QTBUG-26440 Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Removed existing iOS mkspecs. Added Qt5 iOS mkspecs to unsupported.Ian Dean2012-07-2543-319/+1342
| | | | | Change-Id: I504d987abd092d25c68f7209cb5787a01d6fac50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* tst_MacGui is flakyKalle Juhani Lehtonen2012-07-251-4/+7
| | | | | | | | | | Set the testcase QEXPECT_FAIL only if it is going to fail. Waiting a fix for QTBUG-26514. Change-Id: I05017a347039c0fba4ba41d22d91d056dd4e908c Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix roundtrip between double and string in QDeclarativeListModel leading to ↵Florian Hänel2012-07-252-4/+11
| | | | | | | precision issues Change-Id: Ib667dc79072e900f200943f05fb3db9512f4282e Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* tests: Re-enable tst_QSharedPointer_and_QWidget test.Sergio Ahumada2012-07-232-2/+3
| | | | | | | | | This test crashes so skipping it with QSKIP and re-enable the test. Task-number: QTBUG-26594 Change-Id: I8a22313b59bbe227ef0d7489fe344734c02ad970 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QUrl: add missing detach() in setEncodedUrl, spotted by Marc Mutz.David Faure2012-07-222-2/+8
| | | | | | | Reported-by: Marc Mutz <marc.mutz@kdab.com> Change-Id: If53957bafa9c077981c8ec5107313bc25469b579 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qurl.cpp: Remove trailing whitespaces.David Faure2012-07-211-19/+19
| | | | | Change-Id: Ic075b50cff71fcc2e5dd5c14d55ef2f587cd2418 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clean up qDebug statementsRomain Pokrzywka2012-07-211-3/+2
| | | | | | | | | Probably leftovers, they're not matching with the code anymore and break the build when uncommented for testing. Remove the first one and move the second one to the right place. Change-Id: Ib40df6036efefd6e228c280821a8719f0e6fd47e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix QUrl::isLocalFile documentationSergio Ahumada2012-07-211-1/+1
| | | | | | | | | | | This function was introduced in 4.7 by a2f797b52c4274a62a7cf1f0939aca1429afe211 but then reverted by 98e935eed5549e479f6666680aed1711dc42111c Task-number: QTBUG-21293 Change-Id: I6ec9c6696e5c85e44774184010eb9135ef7f3365 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> (cherry picked from commit e2c27b3052fe49a19c4092759682bddf2c2a37f7)
* Disable QAtomic assembly code for incompatible compilers.Ian Dean2012-07-201-1/+1
| | | | | Change-Id: I1d0798f766ea82ff18bcec10af4d002dab9c18d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adding cflag -c to configure's --sysroot test.Thomas Senyk2012-07-201-1/+1
| | | | | | | | | | This forces compiler-only (avoid linker). Otherwise fails if linker needs more options. This happens for trimslice using codesourcery toolchain. Change-Id: Iea509bf0f53b888505a5ac0fe15b5705712a2fce Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't discard QPA mouse events without an associated window or widgetRomain Pokrzywka2012-07-201-2/+0
| | | | | | | | | | | | The corresponding window and widget are found by the function later on if not provided by the plugin, so having a null widget pointer is valid. This check is unnecessary and breaks integration of QPA plugins not widget-aware, such as the LinuxInput and TsLib ones. The bug has already been fixed in Qt5. Change-Id: I650308ce14e84d42b0c6d64f4f0ae1720728054c Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix null pointer bug when no QPA event integration is used.Ian Dean2012-07-201-0/+1
| | | | | Change-Id: I604c489b9209603346eec23d35444ee1b02bf698 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix typo in configure for Mac: Libraries -> LibrarySergio Ahumada2012-07-191-1/+1
| | | | | | | Task-number: QTBUG-18115 Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit bf3b08ee0644c848a82067d2ad38d1bdc2ec7108)
* Widgets: Fix duplicated line in QMdiAreaSergio Ahumada2012-07-181-1/+1
| | | | | | | | | | Replace duplicated line MaximizeAction with RestoreAction Task-number: QTBUG-17428 Change-Id: I5120afeed6715d28045f3eee01f26ee482f02ed1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 006b620ef9390e9396c69db74e31785b04a5d2d6) Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Doc: Fix typo "a mount of code" -> "amount of code"Sergio Ahumada2012-07-181-1/+1
| | | | | | Task-number: QTBUG-25608 Change-Id: I948bdec6a1794e630aa5ce576e8d56b77121afa6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-182-4/+12
| | | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Only forward-declare some std classes if QT_NO_STL is defined.Raphael Kubo da Costa2012-07-171-0/+2
| | | | | | | | | | | | | | | | | If that is not done, building with clang, libc++ and C++11 support does not work: libc++ defines the iterator tag classes in an inline namespace inside the std namespace, and forward-declaring those classes inside the std namespace itself in qiterator.h causes an ambiguity that clang solves by choosing the incomplete-declared class declared in the enclosing std namespace. This is probably the "clang build problem" reported in commit 19e2b4d6eb733d9fd4eb69c0622b699fd08a3203 to qtbase, which cannot be directly cherry-picked without breaking other classes due to QT_NO_STL still being present in Qt 4. Change-Id: I26e33915347d3f94ef2e10b68fca6b2099ec9491 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Install right version of tools when x-compiling.Rafael Roquetto2012-07-171-1/+1
| | | | | | | | | | | When cross-compiling from a Windows host, we need to install the right (win32) versions of qmake into the target folder. cherry-picked from qt5/qtbase 7267ebe0042e11cf333b99fbcae98d35b23c3bf7 Change-Id: I139645ad11579d62a4d20081bbf383702ee84ae2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* [Blackberry] Initialize dangling pointerRafael Roquetto2012-07-171-0/+1
| | | | | | | | | | | | This was causing the plugin to misbehave whenever the pointer was pointing to random memory address. This is a Qt4 only issue. Change-Id: Ibfe5eec52414b8c37d613b3a99f310ed1184c4ea Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix infinite loop due to FPU limitationStéphane Cerveau2012-07-171-2/+2
| | | | | | | | | | | Bug detected with animatedtiles in example/animation. In qpa mode, using some specific resolution of directfb such as 800x600 causes a bug in FillRectF where there is an infinite loop due to scalabilty of qreal value: One is rounded and the other not. Change-Id: I0a9c902889f589d669f60ff1b71fdc5266143826 Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* test: only QEXPECT_FAIL tst_qgraphicstransform in release modeRohan McGovern2012-07-162-1/+3
| | | | | | | | | | | | The floating point problem which causes this test to fail is not triggered if Qt is compiled in debug mode. Enable QEXPECT_FAIL more narrowly. Task-number: QTBUG-20661 Change-Id: I25f3260b516cd4fda9d8b711aa1140cbda821412 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> (cherry picked from commit 5d481fa2400b08bd11aae364e4f31ccc7a8e909c) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* test: Fix compilation error on old Unix systems caused by ShapeInputSergio Ahumada2012-07-161-2/+2
| | | | | | Change-Id: Idab511868f3e90d1db95541b16dc0eb18a900a04 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>