summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* [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>
* Doc: Fix typoSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23657 Change-Id: I1a931c92fb07806c80353b4c17ee86a0c09f8ad8 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Support fallbacks fonts in UIKit pluginEskil Abrahamsen Blomfeldt2012-07-163-17/+115
| | | | | | | | Code is taken from the Qt 5 CoreText font database, but the hardcoded path for the plist has been modified for iOS. Change-Id: I71271600ec5dd085d469d5c42f9811a23948021f Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Doc: Fix typo foreigh -> foreignSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-23260 Change-Id: I7d9ff3a23e1f20df5883d7c932a51c582945685c Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Blackberry: Apply state from QWidget when creating new QBBWindowThomas McGuire2012-07-161-0/+7
| | | | | | | | | | | Otherwise things like the window position and the parent/child relation were wrong. This is a backport from qtbase commit 095f2d5292ddfb4c77056af89c11327d85af282b. Change-Id: I838a15def49c004d0a0229f208ffa8e4f7aa5216 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Support high resolution screens in QUIKit pluginEskil Abrahamsen Blomfeldt2012-07-132-2/+13
| | | | | | | | | We need to duplicate the scale factor of the screen for the UIView to avoid the final blit to scale the framebuffer, and we need to report scaled metrics to Qt. Change-Id: I79f9a06708436e70e8e7f632f2248b70813214f9 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix for enter key inserting into password fields in SymbianMarko Kenttala2012-07-131-1/+2
| | | | | | | | | | | | | QML TextInput and TextField elements with echoMode TextInput.Password adds enter key into container string. Modified filtering in Symbian QCoeFepInputContext to disable adding enter key for hidden editors. Task-Number: 1009418 Change-Id: If7928ccdb131d11f8c975b0efe890b85f3ba202e Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* QSqlTM: respect generated flag in insertRecord() and setRecord()Mark Brand2012-07-131-1/+4
| | | | | | | | | | | | | | | | These methods failed to respect the setting of the generated flag on the fields of source record. INSERT and UPDATE statements should only include fields where generated is TRUE. Test included. Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440. Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427 Task-number: QTBUG-23592 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix crash when column is inserted before rowspanned cellEskil Abrahamsen Blomfeldt2012-07-131-3/+23
| | | | | | | | | | | | | | When you're inserting a column in front of a rowspanned cell and this cell is not the first in the rowspan, we would get the wrong logical index of the new cell (putting it in front of the initial cell with the rowspan). If the cell does not span all rows, the table will get into a broken state and trigger asserts in update(). To fix this, we search for the first cell after the insertion point which has a logical index higher than the cell directly before the insertion point. Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* doc: removed incorrect reference to Q_OS_X11Rohan McGovern2012-07-131-1/+1
| | | | | | | | It's Q_WS_X11, not Q_OS_X11. Change-Id: I1778f6d268ea0ce702e5eb451f7a9dc0e1b5e754 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QNX: Set the default application font to Slate Pro on BlackberrySean Harmer2012-07-121-1/+7
| | | | | | | | | | | This is already handled by the QPlatformTheme in Qt5 Change-Id: Ice21ecbaeb3f62e467a6e1496200f9040e907eb5 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qws: print the data directoryGirish Ramakrishnan2012-07-111-1/+1
| | | | | Change-Id: Ie5634dce74d115a68f64681e964edce68427f1a6 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add Mac OS 10.8 QSysInfo enumsMorten Sorvig2012-07-102-1/+5
| | | | | | | Change-Id: If52192c5dcd8ba55b7ae7d3e3c4aea75c32d0f99 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QNX: QtGlobal: compile as a C header againMarc Mutz2012-07-091-1/+3
| | | | | | | | | | | | <utility> is a C++ header, only execute the check for the Dinkumware standard library if we're compiling under a C++ compiler. This is a backport of Qt 5 change b65291bc42c7e071e38efdd9ee6c4683f29aca13. Change-Id: I12d5a2c5c003092127773d9c25623d012976c906 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: fix compilation with C++11 enabledMarc Mutz2012-07-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | QNX uses GCC, but by default not libstdc++ as the standard library, but 'libcpp', a Dinkumware-derived implementation that doesn't sport many of the C++11 features, yet. Thus, the compiler detection sets Q_COMPILER_INITIALIZER_LIST, which is correct, in a way, but since we're lacking stdlib support the next #include <initializer_list> will fail. So, simply don't define Q_COMPILER_INITIALIZER_LIST if we're on QNX and detect a Dinkumware signature (taken from Boost.Config). This is a back-port of change Ieeb147251c2935517faba61f75d1580a9e1649c4 from Qt 5. Change-Id: Ic7cd11b19a01ae192f60aae33da5581ff8e4682c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable dedicated screen event thread by default.Rafael Roquetto2012-07-071-3/+3
| | | | | | | | | | Screen events should come through QEventDispatcherBlackberry by default. cherry-picked from qt5/qtbase c54ba8c2520243217e2901fa4379f50ccde0be96 Change-Id: I230a334da1341aca5d6b439298994e630c719233 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* [Blackberry] Fix event loop throughput issueRafael Roquetto2012-07-051-8/+25
| | | | | | | | | | | Currently, only one bps event can be handled per event loop iteration, bringing about a huge performance penalty. This patch fixes this issue by bulk processing events whenever they are available. cherry-picked from qt5/qtbase 40bfbf3a5b765d939a7eea999c49da5b16456ad1 Change-Id: I52cc82d93754c2f6acf66f5b0445e34a68d233bf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* ARM: fix compilation with C++11 enabledMarc Mutz2012-07-052-2/+2
| | | | | | | | | | | | | | | C++11 makes narrowing initialisation using {}s an error. For an ARM target qreal != double, so force-cast to qreal. KAPPA now is consistent with the define of the same name in qbezier.cpp. Change-Id: I506218ee1f8cd0cdee21791cc402a479a429f7e5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix socket notifier registration on Blackberry.Rafael Roquetto2012-07-052-8/+52
| | | | | | | | | | | | This fixes a bug on QEventDispatcherBlackberry, where registerSocketNotifier() and unregisterSocketNotifier() wrongly assumed that a file descriptor was being watched exclusively by one QSocketNotifier, while in fact there can be more than one QSocketNotifier associated with a single file descriptor. cherry-picked from qt5/qtbase: c10bc4c37d07dd7a9180d1810a379e370608c574. Change-Id: Iad2de22f54038e101de744a91be56db00891aca1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>