summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QStringRef: Added toInt(), toUInt(), etc... functions to QStringRef.Keith Gardner2013-02-221-0/+932
| | | | | | | | | | | Added the following functions to QStringRef: toShort, toUShort, toInt, toUInt, toLong, toULong, toLongLong, toULongLong, toFloat, and toDouble. These functions use the corresponding functions found in QLocale. Updated tst_qstringref.cpp to exercise the new functionality. Change-Id: I38668a0cc7da0c101a62613fd16cb5a98286617f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QMetaType of const referencesOlivier Goffart2013-02-212-0/+32
| | | | | | | | | | | | | | This fixes QMetaType detection of const reference arguments in signals while connecting using the new syntax and Qt::QueuedConnection const references should have the same QMetaType as non references. That means we need to remove the const reference while getting the QMetaType. Change-Id: I9b2688da7fb9ae985aec0d8fa62a1165357ffe71 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-202-17/+93
|\ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
| * QStackedLayout: Fix crash when focus widget is destroyed in hide()Jan Arve Saether2013-02-191-0/+88
| | | | | | | | | | | | | | | | | | | | We also have to make sure that when moving back to a page that has a focusWidget(), the focus should go to the focusWidget() Task-number: QTBUG-18242 Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Clean whitespaceJan Arve Saether2013-02-191-5/+5
| | | | | | | | | | Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * moc: Error out when detecting unterminated macro usageTor Arne Vestbø2013-02-192-0/+72
| | | | | | | | | | | | | | | | | | Exhausting the symbol list while looking for the final right parenthesis means it is missing. Task-number: QTBUG-29308 Change-Id: Iccf5897b0f5eb719699fd12d6c8e4a16ff189d9b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Cocoa: Add QMdiSubWindow size grip back.Morten Johan Sørvig2013-02-191-12/+0
| | | | | | | | | | | | | | | | | | | | Change all Q_WS_MAC -> Q_OS_MAC in qmdisubwindow.cpp Remove QEXPECT_FAIL from tst_qmdisubwindow.cpp. Task-number: QTBUG-29434, QTBUG-25297 Change-Id: I299b87ab994e2d5ba93d5bbae48de0df1ac1c9d6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | QProgressBar: Use localized numbers and percent sign.Friedemann Kleint2013-02-201-0/+36
| | | | | | | | | | | | | | | | Task-number: QTBUG-28751 Change-Id: I56aca3e0ee9c579297110c69d2d832c7a57f1ae7 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Karim Pinter <karim.pinter@digia.com>
* | Don't run qmake test that requires macx makespec on non Mac OS platformsTor Arne Vestbø2013-02-201-5/+4
| | | | | | | | | | | | | | And update test to use the clang makespec now that it's the default. Change-Id: Ifdd34c4220ad76f60b91fd6ef39d189f0f6525f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add an encrypted() signal to QNetworkAccessManager and QNetworkReply.Richard Moore2013-02-191-0/+19
| | | | | | | | | | | | | | | | | | | | | | Add an encrypted signal to QNAM and QNetworkReply to allow applications to perform additional checks on the certificate chain beyond those done as part of the standard SSL validation. This allows things like certificate change notification to be implemented for QNAM as they can be for QSSLSocket currently. Change-Id: I693e3e6fec8b7040379b7e7f1f819550e6b2617f Reviewed-by: Peter Hartmann <phartmann@rim.com>
* | Add support for intermediate certificates to server sockets.Richard Moore2013-02-195-6/+159
| | | | | | | | | | | | | | | | | | | | Add intermediate certificates to our server sockets, and to our client certs. Change-Id: Ib5aa575473f9e84f337bebe35099506dd7d7e2ba Task-Number: QTBUG-19825 Task-Number: QTBUG-13281 Reviewed-by: Peter Hartmann <phartmann@rim.com>
* | Store the local certificate in a QList.Richard Moore2013-02-191-0/+16
| | | | | | | | | | | | | | | | | | Instead of storing a single QSslCertificate for a the local cert, store a list of them. This will allow us to handle server sockets that use a certificate that is not issued directly from the CA root in future. Change-Id: I9a36b9a99daa9c0bdd17f61b4ce1a7da746f2e96 Reviewed-by: Peter Hartmann <phartmann@rim.com>
* | Check for network module when building according benchmarksOliver Wolff2013-02-192-2/+2
| | | | | | | | | | Change-Id: I5e4cb3ef6fdb5de772d13029c11170d0f0eb3ee5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Removed unneeded printsupport dependency from qpainter autotestOliver Wolff2013-02-192-4/+0
| | | | | | | | | | Change-Id: I906726a3d77572b9e054adbc68c4755dd663ad87 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Check for printsupport module when building according auto testsOliver Wolff2013-02-191-1/+2
| | | | | | | | | | Change-Id: I9bade7b31c75331190960cb14dee6840e3582c50 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Check for network module when building according auto testsOliver Wolff2013-02-197-2/+28
| | | | | | | | | | Change-Id: I68013bf8e07be8d202b3253f997d4f4db05335a4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | SSL session sharing auto test: Retrieve smaller file for testingPeter Hartmann2013-02-191-1/+1
| | | | | | | | | | | | | | | | The "mediumfile" is actually 9.6 MB large, and makes the test slow and even fail on mobile platforms. Change-Id: I694d9d38e4d09c8e90a03c1141320fe2a757fdd9 Reviewed-by: Richard J. Moore <rich@kde.org>
* | Fix QFileInfo autotest for VxWorks.Pasi Petäjäjärvi2013-02-191-4/+10
| | | | | | | | | | | | | | No users/groups/symlinks on VxWorks. Change-Id: I524a568202db2478b070b16a63ae425224c3aaa0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Fix QFile autotest for VxWorksPasi Petäjäjärvi2013-02-191-2/+12
| | | | | | | | | | | | | | | | No users/file permissions. Open function in VxWorks DKM requires always three parameters. Change-Id: I93fb075d82aa57e210e224bfe4ede40def82c275 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Fix QSettings autotest for VxWorksPasi Petäjäjärvi2013-02-191-0/+2
| | | | | | | | | | | | | | No users/groups on VxWorks. Change-Id: I88912c93fa59dc7c00bdbb973fc34ecd631b3316 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | moc: Error out when detecting unterminated macro usageTor Arne Vestbø2013-02-192-0/+72
| | | | | | | | | | | | | | | | | | Exhausting the symbol list while looking for the final right parenthesis means it is missing. Task-number: QTBUG-29308 Change-Id: Iccf5897b0f5eb719699fd12d6c8e4a16ff189d9b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | QLocale: Added QStringRef overloads to toInt(), toUInt(), etc...Keith Gardner2013-02-181-2/+19
| | | | | | | | | | | | | | | | | | | | Added the following function overloads to QLocale: toShort, toUShort, toInt, toUInt, toLong, toULong, toLongLong, toULongLong, toFloat, and toDouble. Change-Id: I8cd90ca08b88338b08a73a72492f4c91c4f46ea4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1828-118/+77
|\| | | | | | | | | | | | | Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
| * QSqlResult: fix parsing of bound SQL statementsIsrael Lins2013-02-152-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | Parsing for bound SQL parameters now handles identifier quoting using double quotes (") and square brackets ([]). The following has only 1 bound value but previously 2 were detected: SELECT 1 AS "A?b[?']]]de?ghi", ? Task-number: QTBUG-27159 Change-Id: Icfd02187e1126ff3b5ed11df8d4e599f574e61bf Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * QLocale: add autotest for tamil's AM/PM textEl Mehdi Fekari2013-02-151-0/+4
| | | | | | | | | | | | Change-Id: I67e572f16fcabd5833549286be20172e7f2a2337 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fixed crashes when using QImage in combination with QCoreApplication.Samuel Rødal2013-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As long as fonts weren't used we supported using QImage in combination with QCoreApplication in 4.x, and there's no reason we can't continue doing so. Task-number: QTBUG-29643 Change-Id: I2cf351d3c93f1c175bbf624e45024d39ab913111 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * Fixed mouse double click events not bubbling up to parent widgets.Samuel Rødal2013-02-141-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | The bug was caused by changes b371f3f943703840d0dfbe30505018bcca06e260 and 3bb902495291c50a2f06e8e03a62a647db3e5cd4, which removed the event forwarding that QWidget::mouseDoubleClickEvent() used to do without making sure to call ignore() on the event like QWidget::mousePressEvent() does. Task-number: QTBUG-29680 Change-Id: I98af8052ad3dd1dea15d07a710aa9212ef5e4a68 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Only compile SSL tests when openssl is available.Frederik Gladhorn2013-02-131-7/+7
| | | | | | | | | | Change-Id: I79fc705f30fb84e86bd7d674d90fbbe2d1a124ba Reviewed-by: Richard J. Moore <rich@kde.org>
| * Remove QPointerBase bic check.Stephen Kelly2013-02-1322-110/+0
| | | | | | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed in Qt 5.1. Change-Id: I060c6b2ebcde8dedde85dc21404fc393150d452c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Added QOffscreenSurface class.Yoann Lopes2013-02-181-31/+81
| | | | | | | | | | | | | | | | | | | | | | | | Inherits QSurface and allows to use OpenGL from an arbitrary thread. Platform plugins can implement QPlatformOffscreenSurface, otherwise an invisible QWindow is used by QOffscreenSurface. This patch includes an implementation of QOffscreenSurface for XCB and EglFS platform plugins using pbuffers. Change-Id: I57b4fc1db417331f34826dcfa754b7698782fde4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Remove ifdefs for supporting Mac OS <= 10.5Tor Arne Vestbø2013-02-181-10/+0
| | | | | | | | | | | | | | | | Qt5 requires Mac OS 10.6, so we can remove checks such as if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 Change-Id: Iea21727a277291148704ecf9677ed0b68c24920f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Giuseppe D'Angelo2013-02-1746-198/+25248
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1446-198/+25248
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| | * QLocale: add autotests for Japanese and Czech localesEl Mehdi Fekari2013-02-121-0/+7
| | | | | | | | | | | | | | | | | | Change-Id: Id4351ab49bfbdf91b65ccb5153c5d01f53acdf72 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Fix developer-build of qsslsocket_onDemandCertificates_member.Friedemann Kleint2013-02-121-4/+5
| | | | | | | | | | | | | | | | | | | | | Do not include qsslsocket_p.h unless SSL is present. Change-Id: I7e56b7758729907892d85f97d5a9d3ccaf7a3314 Reviewed-by: Peter Hartmann <phartmann@rim.com>
| | * Fixed QPixmapCache associating path with wrong QPixmap.Samuel Rødal2013-02-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::load() would not detach, so multiple paths could get associated with the same QPixmap, causing the wrong pixmap to be shown. Task-number: QTBUG-29639 Change-Id: I064dd6a9611b5996853bec9fb20b6224a0adcf62 Reviewed-by: aavit <eirik.aavitsland@digia.com>
| | * QSqlQuery tests: fix create table failuresMark Brand2013-02-121-7/+16
| | | | | | | | | | | | | | | Change-Id: Id20517cc68d03ac008650374fadd96cd6626d3fe Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * QSqlQuery tests: fix bool test for postgresqlMark Brand2013-02-121-4/+6
| | | | | | | | | | | | | | | Change-Id: I60634f89841cbc81058588e435c6482c6c0efed6 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * QSqlQuery tests: fix mysql problemsMark Brand2013-02-121-5/+14
| | | | | | | | | | | | | | | | | | Change-Id: I82f4e6c8801c7a936b80ad72c229f915e6d2a4de Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * Fix QWindow::setFramePosition() to keep the size.Friedemann Kleint2013-02-111-1/+5
| | | | | | | | | | | | | | | Change-Id: I14551e0d0573c2e8d86d76eadab4df9f3c8ed5e4 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Fix module name format in displayed codeSze Howe Koh2013-02-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtDBus -> Qt D-Bus QtMultimedia -> Qt Multimedia QtWidgets -> Qt Widgets Change-Id: I96a1523b37e294b10b203782074943c6ec55e34a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix QSqlTableModel:revert() for OnFieldChangeMark Brand2013-02-091-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert() should operate in OnFieldChange edit strategy just as submit() does. The reason in Qt 4 for excluding OnFieldChange was that there was no opportunity to revert. The model was refreshed, causing all changes to be lost. In Qt 5 a failed edit remains in the cache until user action, which could be to revert. Change-Id: Ide021c4f83a53834b7ed81f2abfa3aa49317704d Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * Fix loading of SSL certificate of DER files.BogDan Vatra2013-02-082-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | DER certificates should not be opened as text files, so we only pass the QIODevice::Text flag when the format is QSsl::Pem. Change-Id: I4bad98023c397b967d5beeec0aaa6c414e06fd9c Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Do not crash if the child index is out of range.Jan Arve Saether2013-02-061-0/+5
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29077 Change-Id: I934101cdc121e9ef99de2e9eeaef154dd4cae0d8 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * Fixed crash in image reader when reading certain BMP files.Samuel Rødal2013-02-063-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the high bit in a mask is set, for instance if the mask is 0xff000000, and we shift it to the right by 24 positions, since the mask was not declared as unsigned we ended up with a mask value of 0xffffffff. We then add 1 to this value and divide by the result, causing a division by zero crash. The masks need to be declared unsigned to prevent sign bit extension when shifting right. Task-number: QTBUG-29194 Change-Id: I79260344cebfbdd3ea86416a9c734dca76517999 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * QSqlTableModel: support refreshing inserted rows with auto columnsMark Brand2013-02-061-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, selectRow() did not work after INSERTing a new row into a table with an automatically populated column. It did not work because the model did not know the primary values for the new row. Newly inserted rows were therefore not refreshed in OnFieldChange and OnRowChange edit strategies. This change provides support for the typical simple case where a single column is populated by the database and can be retrieved with QSqlQuery::lastInsertId(). Task-Number: QTBUG-29102 Change-Id: Ibf0f0ac8661185bde57034ddf40c2178bece4778 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lukas Geyer <lgeyer@gmx.at> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * QSqlTableModel::setData(): fix non-change detectionMark Brand2013-02-061-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 10ff9de91bedf93852f13a58287afd8831644759 introduced the optimization of ignoring non-changes, but it overshot the mark. It neglected to consider that QVariant's equality operator does not compare the null flag. It also failed to consider that setData() has a useful side effect of setting the generated flag in a column of a pending INSERT. This is important when the application actually wants a NULL to be inserted into the column. Task-number: QTBUG-29217 Change-Id: I1368f7acc21eebfeb5a8d23746fc38f6f30fd395 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * fix QSqlTableModel::headerData() for empty query with inserted rowMark Brand2013-02-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSqlQueryModel::headerData() relied on virtual indexInQuery() to detect whether the requested column at row 0 mapped to an index in the query. This failed when row 0 was a pending insert managed by QSqlTableModel, and therefore not in the query. The only thing that matters here is the column. Task-number: QTBUG-29108 Change-Id: I3e0ae85ba223e444781ec8033386d394bb44f0e8 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * QSqlError test: Fix isValid()-check for constructed QSqlError.Marcel Krems2013-02-041-1/+1
| | | | | | | | | | | | | | | Change-Id: I4dc1f537226139ceca017cc36abadd2fba4ce35b Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * tests: Fix some more old references and links to NokiaSergio Ahumada2013-02-0115-154/+154
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: Ifb768b167203c901c5e42ce58c9aaf3db2739320 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>