summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix detection of default platform plugin.Girish Ramakrishnan2012-04-193-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in qconfig.h. This allows us to override the platform name using a configure argument. This commit adds -qpa <platform> that lets the user specify the default platform at configure time. Note that the default platform is not checked against the tree since plugins are allowed to exist outside the Qt source tree. In the absence of -qpa argument, configure checks the mkspec for a variable named QT_QPA_DEFAULT_PLATFORM. This check is implemented only in the unix configure because it will be primarily used in custom mkspecs (devices, boards). If -qpa argument is absent and the mkspec variable is absent, the default value is determined based on the OS as below: Unix - "xcb" Windows - "windows" Mac - "cocoa" QNX - "qnx" Done-with: Jørgen Lind Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed QSimd WindowsCE buildBjoern Breitmeyer2012-04-191-1/+8
| | | | | | Change-Id: I94de251cf1f283d30f92d0fb9d37a1646765cbdd Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove insignification from QDoubleSpinBox test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | This test has not failed during the last 400 CI builds. Task-number: QTBUG-23641 Change-Id: Ibcb840679e023db41456e41eedcfcc38ecedbaac Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Compile fix if QT_NO_CLIPBOARD definedAndreas Holzammer2012-04-192-0/+18
| | | | | Change-Id: Ie8ecaa2ba8f99d0b531b3a81b5f0005508e677eb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Compile fix if QT_NO_CLIPBOARD definedAndreas Holzammer2012-04-192-0/+13
| | | | | Change-Id: I818122f2b2d2119248ad2e84b138aab8ab621a41 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix undefined behavior issue on IntegrityKonstantin Ritt2012-04-192-7/+4
| | | | | | | | in contrast to ::strdup(), qstrdup() allocates memory via new[]; deallocating this memory with free() leads to undefine behavior. Change-Id: I0692c4bef010c05de547283b00b6c6043ac24c79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* optimize canonicalOrderHelper() for generic caseKonstantin Ritt2012-04-191-5/+21
| | | | | | | | | | | if there is no need to swap codepoints A and B, then we proceeding with advance to the next codepoint B that becomes A, and some next codepoint C becomes B; in such case we can easily skip the re-calculations for A by using previously calculated results for B Change-Id: I5c63589c274acaddf0f6a4cb1e0608d352a0c1b3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qwindowsintegration: fix build with -no-accessibility config option setKonstantin Ritt2012-04-194-1/+16
| | | | | | Change-Id: I2f4080b04f61ec425d41180f0163cebcc745c1b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QDoc: Generate index file for DITAXML.Casper van Donderen2012-04-198-198/+209
| | | | | | | | | | | This change moves the fullDocumentLocation function to the generator base-class and adds generateIndex to the DITAXML Generator. All function calls to fullDocumentLocation are now handled by the static function in the base-class which will use the file extension from the currently active generator (either DITAXML or HTML). Change-Id: I24ce09c05a63eb5980b1243c58990e7ce9d42036 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Re-enable QGLThreads autotest on Mac OS X.Jason McDonald2012-04-191-1/+1
| | | | | | | | | | | | | This test passes consistently on Mac OS, but crashes consistently on Windows and fails consistently on Ubuntu 10.04 and 11.10. Disable the test only on platforms where it known to fail, so that CI can use it to detect future regressions on platforms where the test currently passes. Task-number: QTBUG-22560 Change-Id: I0def45e1ed7dd3387e42e7294a495c89bc0caea6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Re-enable QGL autotest on Mac OS X and Ubuntu 11.10.Jason McDonald2012-04-191-1/+2
| | | | | | | | | | | | | This test passes consistently on Mac OS and Ubuntu 11.10, but crashes consistently on Windows and fails consistently on Ubuntu 10.04. Disable the test only on platforms where it known to fail, so that CI can use it to detect future regressions on platforms where the test currently passes. Task-number: QTBUG-25293 Change-Id: I5d6a474ea1e6fdf3983f164ebc181e1dd6e3f639 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from QtConcurrentFilter test.Jason McDonald2012-04-192-2/+2
| | | | | | | | | | This test has one unstable failure that occurs about 0.8% of the time in CI. Make the test catch this particular failure and re-enable the rest of the test. Task-number: QTBUG-20688 Change-Id: I22f5d372db77ea35163f96195ac0c174d8078899 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't use QByteArrayLiteral for a non-stored QByteArrayThiago Macieira2012-04-191-1/+1
| | | | | | | | | Unless you're creating a QByteArray that you will store, don't use QByteArrayLiteral. Using it for 1 byte that is always concatenated to something else is an extreme waste. Change-Id: Icc29e4c4cb1d0aad1714bdeec8ff41da7c301af9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix font substitutions.Friedemann Kleint2012-04-192-53/+26
| | | | | | | | | | | | - Remove remains of platform-specific substitution tables in QtGui. - Deprecate QFont::removeSubstitution() in favour of QFont::removeSubstitutions() (as suggested in the comments). - Clean up substitution code, remove postfix operator++ on iterators and repeated invocation of .end(). Change-Id: I2e82e4ce2dd357d49e4d2b7fd6f95785acfcda95 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* -device: create qdevice.pri only when build tree is initializedGirish Ramakrishnan2012-04-191-9/+9
| | | | | | | | | | | | The build tree is not initialized when -help is passed to configure. The mkspecs/ directory is not created and thus the mv fails results with the following error: mv: cannot move `.device.vars' to `/tmp/qtbase/mkspecs/qdevice.pri': No such file or directory The solution is to create qdevice.pri just before we run config.tests. Change-Id: Ie83018e27a03bb840d213aae8c963b0074e62bb4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* replace getenv("HOME") with a "centralized" QDir::homePath()Konstantin Ritt2012-04-192-2/+2
| | | | | | | | Task-number: QTBUG-4902 Change-Id: Ie9124de45be2d8e859f8b0aaea246e660145a1c5 Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't fail to configure if QNX platform plugin is built.Stephen Kelly2012-04-191-1/+2
| | | | | | | Change-Id: I781eab2fb07fe62d733317b8a72dd899caaf5a80 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a functionality test for DirectFB to ensure it compiles.Thiago Macieira2012-04-193-2/+67
| | | | | | | | | | | | | | | | | | | | | Some versions of the DirectFB headers are unclean and will cause Qt compilation failures. So blacklist those versions. Version 1.5.3 (present in Fedora 16) is known to be buggy and gets disabled by this patch. The compile error was: qurlquery.h:169:5: error: ‘typeof’ was not declared in this scope (qplatformcursor_qpa.h includes qevent.h which includes qurl.h which includes that) The error comes from the Q_FOREACH expansion. Note that Q_FOREACH uses __typeof__, so it's supposed to be safe, unless someone ill-advised goes and defines the GCC "safe" macro (double underscores on both sides) to something else. Change-Id: Ida41ee3b3c2fcba86a7e12182e7055123166693b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Get rid of warning when building qplatformwindow_qpa.cpp.Samuel Rødal2012-04-191-0/+1
| | | | | | | | | This Q_UNUSED was unintentionally lost in 55fa3c189f88933d390177ad5606d. Change-Id: I832ee7c8d46cf66f7b63045015bef181fddebeef Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Do not force OpenGL sample buffers on in the qnx qpa pluginSean Harmer2012-04-191-1/+0
| | | | | | | Change-Id: I6af40382102f2163f5ad8606b498a89db420c5d6 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove internal QClipboardEventLaszlo Agocs2012-04-193-43/+0
| | | | | | | | | | | | This class is not in use with QPA. Also remove useless sending of QEvent::Clipboard from the QGuiApplication dtor. That event is not (cannot be) handled by the platform plugins and is not used at all. Perhaps it should be removed altogether from the public API. Change-Id: I478b31ff9875a8dfff99bddafd335ab02a5fe477 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Extend QUDeviceHelper to detect DRM graphics devices.Hannu Lyytinen2012-04-192-5/+19
| | | | | | | | KMS QPA plugin duplicates udev code needlessly; merging the functionality here. Change-Id: I69be8549f1feee298fe28215d491c8ce5de96b18 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* directfb: Fix namespace compilation.Toby Tomkins2012-04-191-0/+4
| | | | | Change-Id: I55450e0585092f0b052cf6755acc541915c411e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove insignification from QFocusEvent test on Mac OS X.Jason McDonald2012-04-192-1/+3
| | | | | | | | | This test has one stable failure. Mark that failure with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-22815 Change-Id: I38445b659235076b00d9dd82d2a824d1caa1439b Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove insignification from QAccessibility test on Mac OS X.Jason McDonald2012-04-192-2/+3
| | | | | | | | | This test has one stable failure. Mark that failure with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-22812 Change-Id: I1e1ad63472db7ba724c9936ae718de0b3b078bbd Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove insignification from QClipboard test on Mac OS X.Jason McDonald2012-04-191-2/+0
| | | | | | | | | This test hasn't failed for more than 250 CI runs, before which it was failing consistently. Change-Id: I0c2f7d3893731c800bebb0d3d51312d0d0948eb5 Reviewed-by: QTBUG-23057 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove insignification of QStaticText test on Mac OS X.Jason McDonald2012-04-191-2/+0
| | | | | | | | | This test has not failed in more than 300 CI runs, before which it was failing consistently. Change-Id: Ib9a0e4120b276e5620b544a0836134f1cbac7c84 Reviewed-by: QTBUG-23063 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Re-enable QTextScriptEngine test.Jason McDonald2012-04-192-2/+4
| | | | | | | | | The test has two stable failures. Mark these with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-23064 Change-Id: Ibb607ac252a6690d0d37f650a5ae41e5e2a681a2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Re-enable QFontDatabase test on Mac OS X.Jason McDonald2012-04-192-3/+4
| | | | | | | | | | | | | This test has one stable failure on Mac. Mark that failure with QEXPECT_FAIL so that the rest of the test can be used by CI to catch regressions. Also, change the failing QVERIFY to QCOMPARE so that the mismatching QStringList values will appear in the test output. Task-number: QTBUG-23062 Change-Id: Icb0cccfe0bd5bc74a6a2c1ddba89c1f55f5e64de Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Doc: Prepare for building modular QtCore docs.Casper van Donderen2012-04-19345-1604/+2530
| | | | | | | | | | | | This change fixes most qdoc errors in QtCore. There are about 900 left. The main thing this change does is moving documentation from qtcore from /doc/src to /src/corelib/doc. Other issues resolved are mis-use of qdoc commands. Change-Id: I002d01edfb13575e8bf27ce91596a577a92562d1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Re-enable QPrinterInfo test on Mac OS X.Jason McDonald2012-04-191-2/+0
| | | | | | | | | | | | | | | | | | | This test has not failed in the last 1000 CI runs on Mac. It only fails when the test machine has some printers configured, which is not presently true for the CI machines. The two options are to disable the test on all unix platforms (because it fails on all unicies when there are printers present) or to enable the test for all platforms so that CI can catch regressions that don't depend on having printers connected. I choose the latter option. If the CI machines are configured with printers before the known bug is fixed, the failures should be marked with QEXPECT_FAIL rather than disabling the whole test again. Task-number: QTBUG-23060 Change-Id: I3cebed4aefdd088ff00215ea9d7413f90bd9e9b1 Reviewed-by: John Layt <jlayt@kde.org>
* Re-enable the QItemDelegate test on Ubuntu 11.10.Jason McDonald2012-04-191-2/+0
| | | | | | | | | | This test used to be unstable, but has not failed for more than 400 CI builds. Task-number: QTBUG-23637 Change-Id: I0d92136aa9d641e447820ab19b53034f475f74da Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Really marked tst_QProcess as insignificant on Windows.Rohan McGovern2012-04-191-1/+3
| | | | | | | | | | | | | This test hangs ~2.6% of the time in CI. The previous commit which attempted to mark this test as insignificant did not work due to this .pro file doing a load(testcase) prior to the line which set CONFIG += insignificant_test. testcase.prf must be loaded _after_ insignificant_test is set. Task-number: QTBUG-25342 Change-Id: I20470337fda8235e2fd0b6e8d5f564c8c57d167e Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Change coreservices -> iosIan Dean2012-04-1924-54/+54
| | | | | | | | Replace "contains(QT_CONFIG, coreservices)" with "!ios" in config files. Replace "QT_NO_CORESERVICES" with "Q_OS_IOS" in source files. Change-Id: Id3b02316b245a24ce550e0b47596d18a4a409e4f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* qdbusxml2cpp: fix build on WindowsKonstantin Ritt2012-04-191-0/+2
| | | | | | | | | bootstrapped process defines QT_NO_LIBRARY but QT_NO_LIBRARY is not supported on Windows Change-Id: I353a8690832e292522ed6c39a7e0ca19b0980e01 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: fix script error with -helpGirish Ramakrishnan2012-04-191-1/+1
| | | | | | | | configure -help results in the following error: [: 3174: missing ] Change-Id: Ibe7a5292087924d3efd0c87d9fb91deee831171f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Do not assert when QVariant is constructed from an invalid type idJędrzej Nowacki2012-04-194-4/+69
| | | | | | | | | | That change also fix moduleForType() which was wrongly recognizing negative ids as belonging to Core. New tests were added. Change-Id: I40a5819effb32489a45937011980457387c9f8be Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix memory leak when drawing text in non-common scriptEskil Abrahamsen Blomfeldt2012-04-181-3/+14
| | | | | | | | | | | | When the font engine cache was updated for new parameters, we would overwrite the cached engine, but not deref the old cached engine, thus it would never be deleted. This is manual cherry pick of 44c14470e5b28e45c19d6959b114e063cf3f4d83 from 4.8 branch. Change-Id: Ice2e555fe380dc9851ef490fa1a6928936ae4c35 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Optimized EGLFS backing store a bit.Samuel Rødal2012-04-181-8/+29
| | | | | | | | Avoid expensive image copying when possible. Change-Id: Ia79919ea7652d7bfdd744198c494c20cb78a0f48 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix a CMake unit test.Stephen Kelly2012-04-181-2/+4
| | | | | | | | | This has been broken since modules do not currently find their (public) dependencies. Change-Id: I0c9e7c46f7a6499993c98aa6d33996bdd3a1be5f Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Build the first CMake test if *at least* version 2.8.7 is available.Stephen Kelly2012-04-181-1/+1
| | | | | | Change-Id: I061130e5b937ad818cc9016ae62d5890092d60f2 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix unused variable warning.Stephen Kelly2012-04-181-0/+2
| | | | | Change-Id: I8daa2912e1c26e9e9f6bb77f64eb3e06c6715cce Reviewed-by: David Faure <faure@kde.org>
* Remove insignification of QNetworkInterface autotest on Windows.Jason McDonald2012-04-181-2/+0
| | | | | | | This test has not failed in the last 300 CI runs. Change-Id: I559ea223856b1460deb343384d5b4439f42a41d7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove insignification from the Lancelot test.Jason McDonald2012-04-181-2/+0
| | | | | | | This test has not failed in the last 400 CI builds. Change-Id: I22b59565a6a6cb48653bd9b0d967abbf074d59a4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update task numbers for QUdpSocket autotest.Jason McDonald2012-04-181-1/+1
| | | | | | | | Reference tasks with detailed analysis of failures rather than generic task for blacklisted tests. Change-Id: Ibd0ed836ffb84fe9aa14488d43085316e666de21 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix some unused variable warnings.Stephen Kelly2012-04-181-0/+3
| | | | | | Change-Id: I3ffbb155c0efa65bb33a0e2ce80dbd75dc56f3fc Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix some unsigned comparison warnings.Stephen Kelly2012-04-182-2/+2
| | | | | Change-Id: I4e72dbb6e207757c8bb75a7726c83ed5916df094 Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix build with QT_NO_CLIPBOARD.Stephen Kelly2012-04-181-0/+4
| | | | | Change-Id: I82558e1e432934b98236d69106fb98e44e819095 Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove todo comments that are no longer relevant.Kim Motoyoshi Kalland2012-04-182-5/+3
| | | | | | | | Task-number: QTBUG-25067 Change-Id: I5d3022a2881a3c6c97429f609fe567bd9970a046 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Revert "Fix memory leak of QFontEngineData"Lars Knoll2012-04-181-4/+4
| | | | | | | | | This reverts commit addffb71b45b5123ee449f0cfa4891dcab044a9f. The fix causes crashes on exit in Qt Declarative. Change-Id: Ib1fc67c27fb1869b7824ba080083da67b8878fff Reviewed-by: Lars Knoll <lars.knoll@nokia.com>