summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* change NSTextInput to NSTextInputClient in Cocoa pluginTasuku Suzuki2012-04-182-25/+23
| | | | | | | | NSTextInput protocol is slated for deprecation Task-number: QTBUG-23867 Change-Id: I3f9eadc31bdf4234c63f1bcde5172f22da8d340e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed libjpeg compiler warning about macro redefinition.Janne Anttila2012-04-181-1/+1
| | | | | | | | | | | When compiling Qt for Windows CE the MSVC reported the followin warning: warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from commit 1a1a8f004824b981865c6239747ff05d8e6f812a)
* Ignore moduledir/doc in syncqtLars Knoll2012-04-171-0/+3
| | | | | | | | | | | | When modularizing our documentation, module level documentation is supposed to go into a doc subfolder in the modules sources. Since this folder also contains header files (snippets), we need to ignore it in syncqt. Change-Id: If8159816b042a1a6c810eaa0b6dbd99bf58d8ffa Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* remove useless workaroundMark Brand2012-04-171-2/+1
| | | | | | | | | | | | | | The workaround attempts to let the application reserve memory in QString for receiving the stored procedure output parameter. This does not work because the reserved capacity is not preserved through QVariant. Unfortunately, the application must actually populate QString with at least the number of characters that will be received. Change-Id: Icb3be60d6bd570ad2349f20fb7d93b340e395627 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* QTBUG-18435 fix stored procedure output parameters on ODBCMark Brand2012-04-172-5/+38
| | | | | | | | | | | | | | | | Follow-up to c55a99965d8c08d5f924d49db4fe4aa49df8096. 3 problems prevented stored procedure output parameters from working. - SQLBindParameter needs access to buffer provided by QByteArray. - The length of the buffer is measured in bytes. - A typo corrupted conversion back to QString. Also, data() makes more sense than constData() to expose the buffer. Task-Id: QTBUG-18435 Change-Id: I66444b13c0f584ed79bcf026e5a23caff83c22cb Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Only send progress bar updates when visible.Frederik Gladhorn2012-04-171-2/+4
| | | | | | | | | | | | | | | Screen readers tend to announce progress. Some applications (for example KMail) have hidden progress bars that update frequently. While the applications should be fixed, it's better not to spam the user with continous progress announcements. Ported from Qt 4 patch. Change-Id: I5f3b5a83dc80594d995b10e58527115de8601c77 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit 90dc28900d3abfb00a65fef1d9daf36e727dfdca)
* Accessibility: Check for valid range of tree items.Frederik Gladhorn2012-04-171-0/+4
| | | | | | | This might lead to crashes otherwise. Change-Id: Ib28ac03b7d200571a0e759467eb692cfee3b05f3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Use parentheses in statement with && and ||.Frederik Gladhorn2012-04-171-1/+1
| | | | | | | | Forwardport from Qt 4 Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit 330b0bece4d7805067f488c157532f9fb9b48bbc)
* QThreadPool: unify waitForDone() overloadsKonstantin Ritt2012-04-173-19/+5
| | | | | Change-Id: I1515a65fab37588372794422a43ed09ac076e108 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QThreadPool: optimize enqueueTask() for common caseKonstantin Ritt2012-04-171-12/+10
| | | | | | | | | | | the most-common case is: queue is empty or filled with tasks of the same priority; so the runnable would be put at the end of queue. both checks are cheap for us. also avoid detach()'ing by using const iterators Change-Id: Iab2255f852211f9accc8d717f778671661210ef3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* fix QChar::decompositionTag() returns wrong result for Hangul syllablesKonstantin Ritt2012-04-172-0/+29
| | | | | Change-Id: I28e7b14b6a90aa539f8a50107737a66b3484fc00 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix QChar::isPrint() returns an incorrect result.Konstantin Ritt2012-04-172-5/+70
| | | | | | | | results are now equals to results of ICU's u_isprint() for the entire set of the Unicode code points Change-Id: I763f4b37cccd285eb01543d486f25bd7ea011241 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* fix QSqlQuery ODBC auto testsMark Brand2012-04-171-8/+22
| | | | | | | | | | | | | The placeholder name must include the : prefix. Several type tests for aggregate functions assumed sqlite behavior which is actually exceptional due to sqlite's loose type system. REAL is a synonymn for DOUBLE in sqlite but is also compatible with at least MS SQL Server, PostgreSQL, Oracle, and MySQL. Change-Id: I97f8c55d2e962b072cfab11a121fda685666e754 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fixed RGBA <-> BGRA bug in EGLFS backingstore.Samuel Rødal2012-04-171-1/+1
| | | | | | | | | Better to swizzle in the fragment shader than to do a byte swapping operation on the CPU. Change-Id: I01420c3a5ceb5309f5648e1f86979b025bdd88aa Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove insignification from QPluginLoader and QFactoryLoader tests.Jason McDonald2012-04-172-3/+0
| | | | | | | | | | | | | | Archived build logs on http://testresults.qt-project.org/ci/ show that the QPluginLoader test has failed in CI only once in the last 1000 builds (in build 1786), and on that occasion the test was legitimately blocking a regression. The QFactoryLoader test was derived from the QPluginLoader test and has not failed since its first run on March 29, 2012. Task-number: QTBUG-22765 Change-Id: I866b4b8e30e393e0c7e7292119c072b27008ab43 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fixed MSVC compiler warning for zlib when compiling on WEC7.Janne Anttila2012-04-171-2/+6
| | | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. zlib redefined the same macro without checking if it is already defined. Added #ifdef guard to zlib when defining _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from commit a0a970447d63e5c9afdb55d179d671d9c24e9061)
* mkspecs: Rename freebsd-g++40 to freebsd-g++46.Raphael Kubo da Costa2012-04-172-3/+3
| | | | | | | | | lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the lang/gcc port, which provides a stable GCC version newer than the one in the base system, is currently pointing to the 4.6 series. Change-Id: Ifd959ef7b9cd122aa606644e97e337ace8742245 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: Sync freebsd-g++40 and freebsd-g++.Raphael Kubo da Costa2012-04-171-35/+6
| | | | | | | | Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and eliminate a lot of duplicate definitions. Change-Id: Ib3fe572ee276645fb03034a08fbc8e06720b6372 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-11/+0
| | | | | | | | | | | According to FreeBSD svn r52802 from 1999 the -aout compiler option and the QT_AOUT_UNDERSCORE trick were already obsolete. Since the FreeBSD project itself only supports versions 7 and above these days, the definition can be safely removed. Change-Id: I324d5d5b136a6560d9e1b5c81b93efc32d87cdc2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-126/+0
| | | | | | | | | | | GCC 3.4 is older than the 4.2.1 in the base system, and should be removed from the ports tree. Besides, nobody in their sane mind would want to build Qt with such an old compiler. Change-Id: Ib40357758058505465a8bfcefbd182b9240591a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or >= 4, branched in early 1999. FreeBSD < 7 is not supported by the upstream project anymore, so we can simplify the code and rely on the QT_SOCKLEN_T definition in common/posix/qplatformdefs.h instead. Change-Id: I0e06fc37e29158932b95a2619a7442c6068a7d32 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove insignfication from QGuiApplication test on Windows.Jason McDonald2012-04-172-2/+6
| | | | | | | | | | This test has two stable failures, one of which slipped through while the test was disabled. Mark the failures with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-24186 Change-Id: Ie24f86603a01634d6eec5a42baa77e966f9388c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix a thread safety issue with QTextLine::glyphRunsPierre Rossi2012-04-171-1/+7
| | | | | | | | | | | This is a very partial revert of 10ac80708. Revert back to using engineFromScript, which is reentrant, for cases other than the "rawfont mode". In that last case, reentrancy is not a big issue so far as the only client is WebKit, and this is used in the web process, with no threaded rendering. Change-Id: I047b04cf0236d52e6d548f34cddd3dcc7c3c5f83 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix memory leak of QFontEngineDataJian Liang2012-04-171-4/+4
| | | | | | | | | | | | | | | Move QFont::cleanup(); and cleanupThreadData(); to the end of destructor of QGuiApplicationPrivate class. This is because they will trigger the QFontCache::~QFontCache() function being called and at that time the platform_theme object still hold some fonts object, This will cause the QFontEngineData object hold by those fonts can never been deleted. Change-Id: I4d3f21c5e2683706f68395ba3ad24203081e1d1d Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Add function getters in the native interfaceJørgen Lind2012-04-172-0/+33
| | | | | Change-Id: I4609071e38c3807479375ef98f260516da03ec15 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* QDoc: Write subclasses of namespaces in automatic ditamap.Casper van Donderen2012-04-171-13/+22
| | | | | | | Now we also write the subclasses of namespaces sorted to qt.ditamap. Change-Id: I4a4376bac208b9bacd5a2ddd5265faef13dc2eba Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Add some missing \internal for accessibilityJan-Arve Saether2012-04-171-0/+1
| | | | | Change-Id: I42c0a14908cfcccd2218f887b286515fef8d6611 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-173-6/+20
| | | | | | | | | | | This is a regression introduced by commit 22b7d211865c1505862627a2e65bcd063e314e45. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: I3f3bfe23af802444b078a29ee5565dd2bd24a34d Reviewed-by: David Faure <faure@kde.org>
* Merge "Merge remote-tracking branch 'origin/api_changes'" into ↵Lars Knoll2012-04-17583-23704/+28379
|\ | | | | | | refs/staging/master