summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmake: un-copy-and-pastify vcxproj generator a bitJoerg Bornemann2012-08-082-60/+70
| | | | | | | | | | Reusing already built strings improves readability and performance. Cherry-picked from qt5/qtbase commit b4ae57c881455d791f4587978423c47b046a9a4e Change-Id: I62554ffb9100af47ffb4978d51444a4cbbea7572 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Avoid crashes when invalidating a proxy model filter.Stephen Kelly2012-08-082-3/+70
| | | | | | | | | | Backport of b84e180263d0da3d1e6967fcf759225a778ea6ea from qtbase. Task-number: QTBUG-26107 Change-Id: I8323b19ce7b641165de21ad9a6e6b05bf4d93b1c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)Kent Hansen2012-08-088-39/+84
| | | | | | | | | | | Cherry-picked from webkit commit a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 Task-number: QTBUG-23871 Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> (cherry picked from commit 79ebd39d0d4846cb911ae122d2059e5add568d7e in qtscript) Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* test: Re-enable tst_Symbols testSergio Ahumada2012-08-082-3/+1
| | | | | | | | Adding '--dynamic' to nm to display dynamic symbols rather than the normal symbols. Change-Id: Ia162cbb6e1290835727f3bf2c4b8702ba22c6fd3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* examples: Add dockwidgets to the list of examplesSergio Ahumada2012-08-061-0/+1
| | | | | | | This example is needed by tst_GuiAppLauncher::run() Change-Id: I4ad828006bb0b801eefc374950f1345fdf2b0f8b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix valgrind errors due to "const char *getSystemLocale"David Faure2012-08-061-1/+1
| | | | | | | | | | qgetenv returns a QByteArray, so casting that to a char* leads to using deleted memory. This was introduced by 25c4ce6deef20c69d00fe1197a60e8b7587c81cb. Change-Id: I27ccad022e327e119fea3c3cdcf9beb541ab9097 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com>
* tests: Re-enable QTextScriptEngine test.Sergio Ahumada2012-08-062-2/+10
| | | | | | | | | The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26495 Change-Id: I9897c4008bd925402f18af87988feedcdd729062 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tests: Re-enable QAccessibility test.Sergio Ahumada2012-08-032-2/+12
| | | | | | | | | The test has four stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26499 Change-Id: I3774405f736609a4c262d2d44c5ffcceec1a0a09 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Check that property descriptor members are valid before using themKent Hansen2012-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | Even if getPropertyDescriptor() returns true, it's not guaranteed that PropertyDescriptor::setter() or PropertyDescriptor::value() returns a valid JSC value. This code is in an "#ifdef QT_BUILD_SCRIPT_LIB" block, i.e. a patch we added on top of the original JSC sources. The lack of checks caused the getter-in-prototype and indexed-accessors tests from the V8 test suite to assert in debug mode. Cherry-picked from qt5/qtscript commit db17c14cace450e20745839014075c0263f8618f Task-number: QTBUG-17915 Change-Id: I55db26cfe4b63363be92a0b75f2c69b878ea9ef3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Don't crash if queued signal handler no longer existsKent Hansen2012-08-032-1/+40
| | | | | | | | | Cherry-picked from qt5/script commit c89315da2e836fe67c4228cfb73c25a68b0a3a95 Task-number: QTBUG-26261 Change-Id: I24544e2f8c36eaf19c65d9a30affd1f3e05b52bb Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix crash when converting invalid JSValue to stringKent Hansen2012-08-032-0/+11
| | | | | | | | | | | JSC::JSValue::toString() expects that the input is valid. Cherry-picked from qt5/qtscript commit b2969c97fd808e229ff57949dbb9c683f3830b71 Task-number: QTBUG-21896 Change-Id: I534642154ffa4ae400a2ab8e5ce1f0c35899ae6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Stop allowing the old-style Contact: line in license headersSergio Ahumada2012-08-021-7/+1
| | | | | | | | | | | The following line should be used instead ## Contact: http://www.qt-project.org/ Change-Id: I75479b017a76872640043920811066d4a0605a10 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* test: Re-enable tst_Headers test.Sergio Ahumada2012-08-022-2/+6
| | | | | | | | The test had one stable failure which should be fixed by adding missing QT_MODULE and QT_BEGIN_NAMESPACE macros Change-Id: I10801e4c495bee66e1937a57d14019dae8b43a9d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix crash when accessing QObject properties through activation objectKent Hansen2012-08-022-0/+22
| | | | | | | | | | | | | | | | | | | Since objects in the scope chain have to be JSActivationObjects, QScriptContext::setActivationObject() creates a proxy object that should delegate access to the actual object. This case was not handled in the toQObject() conversion function, so for activation property access through evaluation (where the this-object would be the proxy object, not the actual QObject), the this-object conversion to QObject would fail, and the assert "this-object must be a QObject" was triggered. Cherry-picked from qt5/qtscript commit 44062ea8e2499f8d2061c7e5be8fb754f2ba4310 Task-number: QTBUG-21760 Change-Id: I284b70ea5c9af3a15dadd4243283afe0d00bcd5a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Update Czech translationPavel Fric2012-08-013-399/+566
| | | | | | Change-Id: I27320a1a1553fa9f36e00c9395ff2fad2c40cb03 Reviewed-by: Tomas Pospichal <tm.pospichal@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adding missing QT_BEGIN_HEADER/QT_END_HEADERSergio Ahumada2012-08-011-1/+5
| | | | | | Change-Id: I1144497ec8376ec41c714b7a55c05637b6feee66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> (cherry picked from commit 0e904279bd14c6d3d32165ff93d22d96e7ff6fd7)
* 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>
generated by cgit v0.12 at 2025-01-12 19:39:44 (GMT)