summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* test: remove CONFIG+=insignificant_test for tst_qgraphicstransformRohan McGovern2012-07-162-8/+52
| | | | | | | | | | | | | | | This autotest failure is stable, so it should be marked with QEXPECT_FAIL, not CONFIG+=insignificant_test. Note that the test row naming had to be changed, as the test previously created many rows of testdata with the same name, making it impossible to skip only the broken rows. Task-number: QTBUG-20661 Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> (cherry picked from commit 95d9a0c25c207c7dfc5fa228e90a2eb873b2ecbc) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* New command line switches for configure.exeRafael Roquetto2012-07-161-2/+184
| | | | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -qpa * -nis (-no-nis) * -neon (-no-neon) * -largefile * -little-endian (-big-endian) * -fontconfig (-no-fontconfig) * -system-freetype * -gnu-iconv * -sun-iconv * -posix-ipc based on qt5/qtbase: 1838a6c2fb5e3b4368c871aa330d028b255b83af Change-Id: I4a5adf09e4c0e312372b96dceb87ff3310e26ba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Fix typo slection -> selectionSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-25577 Change-Id: I89d6bc2c23283c802240194575a1a4c394b6e96f Reviewed-by: Casper van Donderen <casper.vandonderen@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>
* Doc: Fix typoSergio Ahumada2012-07-161-1/+1
| | | | | | Task-number: QTBUG-24317 Change-Id: Ieaddea0df2984bb065bfd16203ba07623432e40f 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>
* tests: Re-enable tst_MacGui test.Sergio Ahumada2012-07-162-2/+3
| | | | | | | | | The test has one stable failure. Mark this with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-26514 Change-Id: I6faeda44224f2010ed836425a787269bfe483168 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix 'make install' when cross-compiling on WindowsRafael Roquetto2012-07-131-1/+5
| | | | | | | | | | | | | | When cross-compiling on a Unix-like environment in a Windows host we let the default mkspecs be copied to the target directory, instead of being symlinked. On Windows, there is an extra-line on the install_mkspecs Makefile target which also copies (rather than linking) the default mkspecs to $QT_INSTALL_DIR/mkspecs/default. So in the end this patch removes a duplicate which was not working, causing the install_mkspecs target to fail. Change-Id: I44be3a55c11cd7916b4b9ea6a0db1f8d97d28353 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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>
* test: fixed tst_qfilesystemmodel and removed insignificant_testRohan McGovern2012-07-132-2/+4
| | | | | | | | | | | tst_qfilesystemmodel::sort uses some internal API to affect the sorting behavior. This means that part of the test must be disabled when private symbols aren't available. Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> (cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b) Reviewed-by: Rohan McGovern <rohan.mcgovern@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-132-1/+29
| | | | | | | | | | | | | | | | 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-132-3/+52
| | | | | | | | | | | | | | 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>
* Don't change the current page of mainwindow containerJarek Kobus2012-07-061-1/+1
| | | | | | | Task-number: QTBUG-12097 Change-Id: I3d9fa918ac8ea9ee419a3384f0d9e33366315a6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.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>
* Update macdeployqt plugin deployment logic.Morten Johan Sorvig2012-07-051-0/+12
| | | | | | | | Handle qmltooling, graphics system and bearer plugins. Change-Id: I6f75dc600255013b88558d265a1b1ed25369f8e9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.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>
* Fix compilation errorJaakko Helanti2012-07-051-0/+2
| | | | | | | | | | Gerrit change I0b9f6205ca1521fc54d3b688ccd1225823263aac is missing two needed header file includes. This task adds them in. Change-Id: I210515cef81bc03a5ad76a4bac3a5a50ad28e37d Reviewed-by: Aapo Haapanen <ext-aapo.haapanen@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Add null httpReply checks to QHttpThreadDelegateShane Kearns2012-07-041-6/+25
| | | | | | | | | | | | | | | | | | If a request is aborted while under load, the abort signal can be queued in front of a signal emitted from the httpReply. The abort slot is deleting the httpReply and setting it to null. So when the queued slot is processed the httpReply is null and caused an MMU fault. Removed qWarning from existing null checks, as these are expected if abort is called with precise timing so that it races with the reply finishing on the socket. Task-number: QTBUG-26245 Change-Id: I0a7e0223fda1bc01d117fe8a993c7f6e43fd72ff Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Richard J. Moore <rich@kde.org> (cherry picked from commit 41064f851591d9437baeda502b6e2504fee8f213)
* Qml ListView highlight component cannot access ListView scopeMartin Jones2012-07-042-64/+48
| | | | | | | | | Use the component creationContext to create the highlight item. Also do this for the header and footer. Task-number: QTBUG-26043 Change-Id: Ib4b947d022cb1513f728ac66455bfd2fe2703744 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Ensure the mouse buttons are preserved when entering a widgetAndy Shaw2012-07-033-3/+5
| | | | | | | | | | | | On Mac we have to fake the QEvent::Enter event when entering a widget so we need to ensure the buttons held down are set as part of that event otherwise it causes problems with graphicsview which will update the grabbed item based on this event. Task-number: QTBUG-19353 Change-Id: I89252a46b5edd0d82b6b1a0cf2592f72b472e5cc Reviewed-by: Nils Jeisecke <jeisecke@saltation.de> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix cursor truncate to include line positionJiang Jiang2012-07-031-2/+2
| | | | | | | | Since we could have moved the line position (QTextLine::setPosition), the truncating position should be adjusted with that. Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Use utf8 to store audio device names in win32 backend.Lev Zelenskiy2012-07-031-3/+3
| | | | | | | QTBUG-21398 Change-Id: I9a319d4365b1fa26b6b4f63baf7c97e26df4f482 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Added support for big endian data to QAudioOutput win32 backend.Lev Zelenskiy2012-07-031-0/+25
| | | | | | | | Convert data from big endian to little endian. QTBUG-19881 Change-Id: Id98c2158ed056dd89fe2656e8f262d4b37f94eb7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Allow frequences up to 96000 in win32 backend.Lev Zelenskiy2012-07-032-2/+2
| | | | | | | QTBUG-26102 Change-Id: I08377d49a444ca3db1d1c0ccabc00665b4480f9b Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Clean buffers before closing the input device.Lev Zelenskiy2012-07-031-6/+7
| | | | | | | | Input device handle is invalid after waveInClose() QTBUG-24119 Change-Id: I3b2554f816f5ca66be4d992a0a579561639caf9f Reviewed-by: Michael Goddard <michael.goddard@nokia.com>