summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add API dealing with QMargins to QRect.Friedemann Kleint2013-01-077-13/+128
| | | | | | | | | | - Addition of a QMargin to a QRect. - Removal of a QMargin from a QRect. - Remove implementation from Windows platform plugin. Change-Id: Iae54bc13e94a7ece48853b1d3f3de2bfc154d2dd Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Improve QRegularExpression autotestsGiuseppe D'Angelo2013-01-071-0/+9
| | | | | | | | | Check that the regular expression, the match type and the match options returned by QRegularExpression/QRegularExpressionIterator are the same ones passed to match / globalMatch. Change-Id: Ibd282379bb60b53d614b1d56a7e08b3d6c236da6 Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Rename QRegularExpression-related feature defs to QT_NO_REGULAREXPRESSIONGiuseppe D'Angelo2013-01-0715-57/+76
| | | | | | | | | | | | QRegExp and QRegularExpression are totally independent, therefore using two different defines is the right thing to do. Also, document the new define in qfeatures.{txt,h}. Change-Id: Ice4826ea543f4b22f1cc27bf31ed6e043d0c43b0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Get rid of pre-QPA leftoversKonstantin Ritt2013-01-073-240/+1
| | | | | Change-Id: I61a393baa387f2f90dc652d6a9df1c41c3730611 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Automatically register method types in QSignalSpy.Stephen Kelly2013-01-072-2/+51
| | | | | Change-Id: I3655291dca6dbd3d8d09ee835b85983caa911b64 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix the \since version for QSharedPointer::create().Stephen Kelly2013-01-071-1/+1
| | | | | | | | | | It is not relevant that it has been part of the class since Qt 4.6. It has always been internal until now. The release where it became public API (5.1) is what is relevant. Change-Id: Ib740f3ed6df190884a94fb2c11dd74cd7edb7b1a Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Introduce QRegularExpressionValidatorGiuseppe D'Angelo2013-01-077-0/+356
| | | | | | | | QRegularExpression counterpart for QRegExpValidator. Change-Id: Ib391e73dd49e32aeb9b48e6f2217b67a17a83a11 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge branch 'stable' into devFrederik Gladhorn2013-01-041164-5898/+8636
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
| * test: Change trolltech.com:443 to qt-project.org:443Sergio Ahumada2013-01-031-1/+1
| | | | | | | | | | | | | | | | trolltech.com seems to be shut down already Change-Id: Ic90ce01aeb51b6f154b9bbf4762c365a398c9e3d Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Move the Q_DECLARE_METATYPE for QList<QSslError> to qsslerror.hStephen Kelly2013-01-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it is possible to assert if qRegisterMetaType<QList<QSslError> >("QList<QSslError>") is called in a TU which does not include the Q_DECLARE_METATYPE invocation. Change-Id: Ice1ffbb0f8d0a745d2bffc8b4e13ca31621e8ca4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
| * Fix GCC warning about parentheses in QtPlatformSupportThiago Macieira2013-01-021-1/+2
| | | | | | | | | | | | | | atspiadaptor.cpp:2140:12: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=parentheses] Change-Id: Ib21308f9c1b3bf813fed803228d8adbcc3ce7e9f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * Make qtestaccessible.h compile with QT_NO_KEYWORDSThiago Macieira2013-01-021-1/+1
| | | | | | | | | | Change-Id: I2065be84d69db62cdae1ad6ac66a09fc5f3454eb Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * qdbusxml2cpp: Check string length before checking for \r\n.Jon Severinsson2013-01-021-1/+1
| | | | | | | | | | | | Change-Id: I5370bae258933536ecf9785da95a9006fafc1a62 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix warning about unused variableThiago Macieira2013-01-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | qeglfshooks.h:77:21: error: 'hooks' defined but not used [-Werror=unused-variable] Defining a static variable in a header file is a terrible idea. But if I remove it, other code breaks and I don't have the time to fix them all. Change-Id: I4f94cbc7f0790df91853662749701e8fb11c2347 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Fix bug in multisampling handling when converting from surface formatSean Harmer2013-01-021-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-28875 Change-Id: If72ce0669de8f344603d2da53eeb5644bd5c4f82 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Make QImage::mirrored() propagate devicePixelRatioMorten Johan Sorvig2013-01-021-0/+1
| | | | | | | | | | Change-Id: I2dfeacc941cb411a7ec6752f745fed9d6345ed8a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Make these headers includable directly, on all systemsThiago Macieira2013-01-012-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | For qwineventnotifier.h, just wrap the code around #ifdef Q_OS_WIN. This has the added benefit of fixing the current qt_no_master_include problem (that is, even if you #include <QtCore> on Windows, you wouldn't get it). For qtypetraits.h, it requires qglobal.h first. Change-Id: If1ba09a0a29de429a5b87e9878c8ac6a62a443c4 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix warning found by clang:Thiago Macieira2012-12-311-1/+1
| | | | | | | | | | | | | | | | kernel/qwidgetsfunctions_wince.h:61:34: error: no newline at end of file [-Werror,-Wnewline-eof] Change-Id: Icbc35227946652db53fc8454d1d42043aa7c15b9 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Speed up and fix QByteArray::setNum()hjk2012-12-303-15/+54
| | | | | | | | | | | | | | | | | | | | | | | | Going through QLocale and QString is not really needed. This also makes the result of the conversion of negative numbers in bases other than 10 independent of the architecture and implements the documented behavior of treating them as unsigned types. Change-Id: Ibc231dc5241deb5cbadd9796484a8b5f79c29410 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Remove unused function _q_qgraphicsItemSetFlagThiago Macieira2012-12-291-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang reports: graphicsview/qgraphicsitem.cpp:1779:13: error: function '_q_qgraphicsItemSetFlag' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration] static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::GraphicsItemFlag flag, ^ According to the public Git history, in Qt 4.5.1 this function was already unused. The only reason it wasn't caught so far is that it is recursive: it calls itself. So it is used... by itself. Change-Id: I6fc6b33cb314b845525dc9315d0ad742e113d5cd Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix warnings reported by Clang in QtWidgetThiago Macieira2012-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | qwizard.cpp:919:24: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if ((info.wizStyle == QWizard::AeroStyle) ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~ Change-Id: I477cc4e331633682b79df3cb0113558e9019280c Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Add qtest_widget.h to the list of testlib headersThiago Macieira2012-12-281-0/+1
| | | | | | | | | | | | | | It was missing. Change-Id: I356f6ccddf4fc56e76858fdeaa8ef116e3b680af Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Fix warnings in the SQL drivers found by GCC 4.7Thiago Macieira2012-12-284-13/+17
| | | | | | | | | | | | | | | | | | | | | | qsql_psql.cpp:774:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch] qsql_mysql.cpp:1163:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch] qsql_sqlite.cpp:527:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch] qsql_odbc.cpp:88:97: error: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Werror=format] qsql_odbc.cpp:706:76: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Change-Id: I79965283057e92a44a0c8375530cfb30107c891c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Don't use MPProcessorsScheduled on Mac OS XThiago Macieira2012-12-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | It's deprecated and it's not available on iOS anyway. The recommended way of getting the number of processors online is via sysctl or sysconf (both of which are just slightly below). qthread_unix.cpp:397:13: error: 'MPProcessorsScheduled' is deprecated: first deprecated in Mac OS X 10.7 [-Werror,-Wdeprecated-declarations] Change-Id: I4bf60985fbde155b78b840f3de3ff0a142b78b19 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Suppress warning in valgrind headers: variable set but not usedThiago Macieira2012-12-281-0/+1
| | | | | | | | | | | | | | qbenchmarkvalgrind.cpp:229:5: error: variable '_qzz_res' set but not used [-Werror=unused-but-set-variable] Change-Id: I3c5896659105650d6d824b10ff3beffbdf494e24 Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Polish code of some opengl exampleshjk2012-12-2829-255/+182
| | | | | | | | | | Change-Id: If24ae1845176fc525cf6a239a5079f4802f8df3f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Add test for QByteArray::setNumhjk2012-12-281-0/+27
| | | | | | | | | | | | Change-Id: I66f3954433bf50fb23fdaeef804838d993e965b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Removed an unnecessary forward declarationThorbjørn Lindeijer2012-12-281-2/+0
| | | | | | | | | | | | | | qstringlist.h is already being included. Change-Id: I1790cd560b934b6697702bd11f78f39cddc3389f Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
| * Fixed typo 'collasping' in QTreeView documentationThorbjørn Lindeijer2012-12-281-1/+1
| | | | | | | | | | | | Change-Id: Ib49c3500c4b3a40a7eaf17404cecc2c38de90530 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Cocoa: Re-enable per class palette on QPA pluginGabriel de Dietrich2012-12-241-16/+16
| | | | | | | | | | | | | | Task-number: QTBUG-28443 Change-Id: If66604e8d002be6cf4c308378199c96be7422e06 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Mac: Bring back proper layout in QMessageBoxGabriel de Dietrich2012-12-242-16/+16
| | | | | | | | | | | | | | | | Resolved by s/Q_WS_MAC/Q_OS_MAC where appropriate. Task-number: QTBUG-28738 Change-Id: I8f1239839bffb092387d527af78e9dbe1628ef67 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| * Fix QMutex::tryLock with negative valuesThiago Macieira2012-12-232-3/+53
| | | | | | | | | | | | | | | | | | | | | | | | The Linux futex implementation had a Q_ASSERT for positive values, but the documentation says that negative values should be interpreted as infinite (equal to lock()). Test that too. Change-Id: I2f96a502d672732781e88e49797756ca9a809121 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix standalone header compilationThiago Macieira2012-12-231-0/+1
| | | | | | | | | | | | | | qtconcurrentfunctionwrappers.h:277:22: error: 'QStringList' was not declared in this scope Change-Id: I54c48386d90146c872679672a1d8cc3675d49c39 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix Clang warning about memcpy a class with vtablesThiago Macieira2012-12-231-1/+1
| | | | | | | | | | Change-Id: I7966014a49cdf4c6c82f012d8b1d16ba8ddc3fcc Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix warning about unused variable in qdocThiago Macieira2012-12-231-1/+1
| | | | | | | | | | | | | | codeparser.cpp:245:18: error: unused variable ‘dn’ [-Werror=unused-variable] Change-Id: Id271b3829ba3278e80d4e79746db7aabfabd751a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * QUrl::fromUserInput: fix for urls without a host.David Faure2012-12-232-2/+5
| | | | | | | | | | | | | | | | | | | | QUrl::fromUserInput("http://") was invalid, which doesn't make sense since QUrl("http://") is valid. Same for "smb:" which is actually even more a valid URL from a user's point of view. Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix QSqlQuery test in relation to PSQL supportAndy Shaw2012-12-222-14/+28
| | | | | | | | | | | | | | | | | | Some things needed to be corrected for testing with PSQL, this was checked against the the PostgreSQL documentation to confirm that the exepected behaviour is correct. Change-Id: I45a6b343e9eb920fcae2a62910ecc956abcac0f0 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Fix warning about unused variable in QtPlatformSupportThiago Macieira2012-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC was complaining: qevdevtouch.cpp:475:13: error: 'maxId' may be used uninitialized in this function [-Werror=maybe-uninitialized] Which got me scratching my head: maxId was unconditionally initialised. How could GCC be complaining about it being uninitialised? Well, turns out that bestId could be uninitialised and the code does: if (bestId > maxId) maxId = bestId; Of course, if bestId was uninitialised, the warning should have been in the "if" line first. Change-Id: I5e174ab2957d76ad040c14fa6ef8535129b6dce3 Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
| * Bump Qt version to 5.0.1Sergio Ahumada2012-12-2113-49/+164
| | | | | | | | | | Change-Id: Ie8f437b8dfe8a67c7b34321439dd988a02612437 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Use the new QUrlPrivate::validateComponent validator in the main parserThiago Macieira2012-12-211-54/+11
| | | | | | | | | | | | | | | | The code was copied from the main parser there, so remove the duplication. Change-Id: I85748f6f76b3097ff22958d9de67cfa27061a72b Reviewed-by: David Faure (KDE) <faure@kde.org>
| * Make sure that the strict parser is also operating on setXxxThiago Macieira2012-12-212-43/+214
| | | | | | | | | | | | | | | | | | | | | | These cases weren't handled before. The validateComponent function is copied from QUrlPrivate::parse, with the added modification that it now needs to check the gen-delims for the userinfo. Change-Id: I055167b977199fa86b56a3a7259a7445585129c6 Reviewed-by: David Faure (KDE) <faure@kde.org>
| * add and use qtHaveModule() functionOswald Buddenhagen2012-12-2178-91/+98
| | | | | | | | | | | | | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix some typosSergio Ahumada2012-12-2110-12/+12
| | | | | | | | | | Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * fix linker command lineOswald Buddenhagen2012-12-211-1/+1
| | | | | | | | | | | | | | | | gcc is apparently tolerant against this abuse. icc is not. Task-number: QTBUG-28775 Change-Id: I872d32177562f076ca8aecd263bc4bb3c7e8edc0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * qmake:Add a case sensitivity flag to ProString::{starts,ends}With()Debao Zhang2012-12-211-8/+8
| | | | | | | | | | Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Add a manual test for QFile.Friedemann Kleint2012-12-213-0/+149
| | | | | | | | | | | | | | | | | | Add a command line program allowing to test rename, copy, etc. Task-number: QTBUG-28246 Change-Id: Ie9667f03b65a874475700ec9ecd91ca2ed32ed97 Reviewed-by: David Faure (KDE) <faure@kde.org>
| * Fix main() signature of headersclean stub fileKai Koehne2012-12-211-1/+1
| | | | | | | | | | | | | | Fix MinGW build errors by using the standard main signature. Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Merge "Merge 'release' into stable" into refs/staging/stableOswald Buddenhagen2012-12-2110-217/+169
| |\
| | * Merge 'release' into stableOswald Buddenhagen2012-12-1910-217/+169
| | |\ | | | | | | | | | | | | Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
| | | * slash the -fast configure optionOswald Buddenhagen2012-12-184-156/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's completely broken, and i have no time to fix it properly now. configure runs no qmake -r by default any more, so it's fast enough. Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>