summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Register less types for QtDeclarative/QCoreApplicationKevin Ottens2012-08-203-68/+78
| | | | | | | | | | | | | | | | | | In Qt5 QtQml and QtQuick are separated so you have control on the amount of facilities you need. It is not the case in Qt4 unfortunately so you always pay the price of those registration. To overcome that, this patch avoids quite some of the type registration when we detect we're not running a QApplication. In such case all the GUI related QtQuick 1 runtime is not usable anyway. We keep around only a handful of convenience like Timer, Connection, Component, etc. Change-Id: Idf5aa935795a224ceb5bc66015282fd094b5686c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Implement QAccessibleLineEdit::characterRect()Jan-Arve Saether2012-08-162-3/+17
| | | | | | | | | It was probably not implemented because it needed to access private APIs. However, accessing those from this a11y plugin is unproblematic. Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix for restoring dockwidget's size when it gets dragged.Mikko Knuutila2012-08-161-6/+24
| | | | | | | | | When user drags a dockwidget out of the docking area, restore widget's previous floating size and center it's titlebar under the mouse. Task-number: QTBUG-2940 Change-Id: I004de36d649abc4c32420bdd46bb6c810ef98c64 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* XMLHttpRequest does not support the DELETE methodJani Honkonen2012-08-151-1/+4
| | | | | | | | | | This is a backport from qt5 commit: 0eeb925aa5039ffddf8d623f250980fc4c97712e Task-number: QTBUG-17963 Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-08-151-0/+13
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* license: Fix Blackberry/QNX license headersSergio Ahumada2012-08-1451-201/+103
| | | | | | | | | | | | | These files where skipped when tst_license was enabled a while ago since they had a different license header that didn't match our test. Fix these licenses and stop skipping them in tst_license.cpp Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Bump hex copy of Qt version number to 4.8.3.Jason McDonald2012-08-141-1/+1
| | | | | | | | | | Change-Id: I7bf366fc15aeb86f0d0a19481b81f690feb7af9a Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix dangling pointer access during drag-n-drop operationNick Shaforostoff2012-08-141-1/+1
| | | | | | | | | delay deco widget freeing because the pointer to it is still available to the drag operation. Task-number: QTBUG-19363 Change-Id: I775864f72d7151c9fbd26feff5a9bd844f87f292 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Accessibility: Add missing break;Jan-Arve Saether2012-08-141-0/+1
| | | | | | | Found while porting QAccessibleTextWidget to Qt 5 Change-Id: I6a8f69d859fad20949e8250f03dd18d4106cc31c Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* make currentText the USER property for QComboBoxMark Brand2012-08-131-2/+2
| | | | | | | | | | | | | | | | QItemDelegate takes the USER property as the value to be set using model->setData(). The text is what is expected. follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0 broke the interaction between QComboBox and QItemDelegate used by QDataWidgetMapper and item views. Task-number: QTBUG-26501 Cherry-picked from qt5/qtbase 816c5540179362500dfc175b77f05abf3ef25233 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Change-Id: Ie9c228f2aa47f194467419398b37d05d98a70a1b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Mac: Don't crash if language preferences can't be retrieved.Eike Ziller2012-08-101-1/+1
| | | | | | | | | That can happen when e.g. running an application with sudo. Task-number: QTBUG-26547 Change-Id: I4b1d4b71716da4026dfa0f68bad905f0010d0968 (cherry-picked from 67d082223c90912a88f5282af90d8fc05f4a389b in Qt5) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Changed qt version to 4.8.3jutaipal2012-08-083-3/+3
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Avoid crashes when invalidating a proxy model filter.Stephen Kelly2012-08-081-3/+4
| | | | | | | | | | 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>
* 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>
* 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-031-1/+7
| | | | | | | | | 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-031-0/+2
| | | | | | | | | | | 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>
* test: Re-enable tst_Headers test.Sergio Ahumada2012-08-021-0/+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-021-0/+4
| | | | | | | | | | | | | | | | | | | 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>
* 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-014378-8840/+8840
| | | | | | | | | | | | | - 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>
* 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>
* 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 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>
* 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>
* 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-252-11/+8
| | | | | | | | | | | | | 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-252-2/+20
| | | | | Change-Id: I504d987abd092d25c68f7209cb5787a01d6fac50 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix roundtrip between double and string in QDeclarativeListModel leading to ↵Florian Hänel2012-07-251-4/+7
| | | | | | | precision issues Change-Id: Ib667dc79072e900f200943f05fb3db9512f4282e Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* QUrl: add missing detach() in setEncodedUrl, spotted by Marc Mutz.David Faure2012-07-221-2/+2
| | | | | | | 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>
* 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>
* 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>
generated by cgit v0.12 at 2024-11-13 23:47:41 (GMT)