summaryrefslogtreecommitdiffstats
path: root/tests/auto
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-0448-110/+198
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * QDnsLookup: test multiple TXT answers tooThiago Macieira2013-06-041-48/+54
| | | | | | | | | | | | | | | | | | | | | | | | The TXT record is particular because each RR can contain multiple text strings. So we need to join each RR's texts too. To make it easy, I've made everything be QStrings. Change-Id: Ia0506544b913585e7be860c81077cff8e0dab547 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * QDnsLookup: test MX and SRV records that can change orderThiago Macieira2013-06-041-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DNS protocol changes the order of the RRs in each reply it sends, in an effort to balance the load in servers. For most tests, to ensure that we get always the same result, we simply sort it back. For MX and SRV, we can't sort because we also need to test that QDnsLookup sorted correctly according to priority. So instead allow that test to have multiple alternatives. Change-Id: I5c119f907b31789de5c9cf2471cc82ecd140d06f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix typoFrederik Gladhorn2013-06-031-1/+1
| | | | | | | | | | Change-Id: I0983f12759fdb806e4fc89f4abefb9088502208d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Made sure items with preferred width of 0 could also stretchJan Arve Saether2013-05-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no stretch factors were specified, we used the preferred size as a stretch factor. Obviously, that didn't work if the preferred size was actually 0. This patch works around this by actually setting the stretch factor to 1.0 if this is the case. This should work fine in most cases, except for the case where there are also other items with a preferred size close to 0. In this case, the item with preferred size 0 will just grow faster than an item with e.g. preferred size 0.1. Task-number: QTBUG-31217 Change-Id: I966455da0bdd00308591c7f7cfbc4e134d423e57 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Disabled test on WINCE.Bjoern Breitmeyer2013-05-271-0/+2
| | | | | | | | | | | | | | | | The winapi call used to load the icon does not support the arguments on windows ce Change-Id: Ia600eb9b05d5eb40778d8c281e6ce8278bfd7177 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * QtTest: Output correct library nameSze Howe Koh2013-05-2743-56/+56
| | | | | | | | | | | | | | | | | | | | | | "QTest" is the C++ namespace; "QtTest" is the library name - Edited the logger output in qplaintestlogger.cpp - Updated documentation - Updated expected outputs for self-tests Change-Id: I43c525c43221a8d4e843a00d6d55b0f06ef55fd7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix parsing of long latin strings in the json parserLars Knoll2013-05-231-0/+45
| | | | | | | | | | | | | | | | | | | | | | Latin1 strings are usually stored as 8 bit data in the json binary format. But that data structure has a size limitation of 16bit, so we need to fall back to storing the string as 16 bit data if it is too long. Task-number: QTBUG-30946 Change-Id: I0069b1367030b0b2f819fd1f04e34c9e2534a2a3 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Make QTime::toString output milliseconds for Qt::TextDate, Qt::ISODate.Mitch Curtis2013-06-033-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section 4.2.2.4 of ISO 8601 allows for decimal fraction representations of dates and times. Currently, when calling QDateTime::toString(Qt::TextDate) or QDateTime::toString(Qt::ISODate), the milliseconds will be omitted. However, QDateTime::fromString(str, Qt::TextDate) and QDateTime::fromString(str, Qt::ISODate) already support decimal fraction representations, so this patch just adds this support to QTime::toString, and hence QDateTime::toString(). Task-number: QTBUG-30250 Change-Id: If58e4b3d3105322c51d11a76b832e5e634d8991f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | widget/graphicsview: Do not run tests showing windows in parallel.Friedemann Kleint2013-06-035-6/+0
| | | | | | | | | | Change-Id: I3bba3f49eba6ca9c187caf696d0f6c73372fec5d Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | gui/kernel: Do not run test showing windows in parallel.Friedemann Kleint2013-05-302-2/+0
| | | | | | | | | | Change-Id: Ic7457a978c03fcd61cd5ce17dde2b00c74b2fb9a Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
* | Core: QDebug and comparison operator support metatypes.Christoph Schleifenbaum2013-05-272-1/+87
| | | | | | | | | | | | | | | | This patch adds a way to enable operator<, operator== and operator<< into QDebug for QVariants with custom types. Change-Id: I3d12d891bd7252ad2b8f1de69bced354800a1f29 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Remove XFAIL from tst_qgraphicswidget::initialShow2().Friedemann Kleint2013-05-272-4/+0
| | | | | | | | | | | | | | | | The test now passes on Ubuntu, Lucid, too. Task-number: QTBUG-20778 Change-Id: Id7ddc4b34d03f8fb9af977c0f40615d544934f13 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Add QComboBox::currentDataGiuseppe D'Angelo2013-05-271-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convenience function that returns user data for the current item, analogous to currentText(). This avoids to having to write the cumbersome QVariant variant = comboBox->itemData(comboBox->currentIndex()); (It's quite common to put strings as text and the corresponding enum values as user data.) Change-Id: I8c7632c647c5583d18e4e22703aeb4447d73162d Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2326-48/+624
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
| * Fix regression when pasting into QTextEdit from Firefox.Mitch Curtis2013-05-231-0/+11
| | | | | | | | | | | | | | | | | | | | Return the codec if one was found by QTextCodec::codecForUtfText, instead of returning the default (UTF-8). Task-number: QTBUG-31293 Change-Id: I95e3260376c00537006b7fbfdc3df5850e1ba657 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Process initial expose events immediately.Morten Johan Sørvig2013-05-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Required to prevent qmlscene flicker on startup. Also brings back that qWait() in tst_QGL::graphicsViewClipping() that seems necessary after all. Amended-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Change-Id: I14ba6e18ac98e5df1ce8ecbc263b30176b67d111 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Stabilize tst_qgraphicssceneindex.Friedemann Kleint2013-05-231-1/+1
| | | | | | | | | | Change-Id: I8cda10a5a4c9bf949b560e7be4da9bef92667688 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * QPrintPreviewDialog: Prevent changing of page in resize handling.Friedemann Kleint2013-05-231-0/+46
| | | | | | | | | | | | | | Task-number: QTBUG-14517 Change-Id: I59e444eed8d44be9fb7213fdbab4be473d595be8 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * Fixed autotest build for configurations without printsupportOliver Wolff2013-05-211-1/+1
| | | | | | | | | | | | Change-Id: I7fc4a6e4885e9640ecfbe93547fb56868ebba309 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * QThreadPool: Fix regression from Qt 4 in dealing with priority startsThiago Macieira2013-05-201-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | The optimisation done in cbaf52b09971edf6f3e1458f7dd677b80a1568ed for Qt 5.0 got the order wrong of the comparison. The queue must be sorted in decreasing priority order. But since higher numbers mean higher priority, that means the queue must be sorted in decreasing priority number order. Task-number: QTBUG-29163 Change-Id: Iaf3424b9bb445bf5c71518927f37253cead454f3 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * QtCore: fix the number precision in QJsonDocument.toJson()Liang Qi2013-05-201-12/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In JSON, any number is stored in double. We need to make sure we keep the maximum possible number precision for integer number. In IEEE 754 double format, the significand precision is 53 bits(52 explicityly stored). Autotest is included. qint64 and double work fine. Task-number: QTBUG-28467 Change-Id: I7f857671c50e4334e9329c778f9b4f090f490540 Reviewed-by: Sune Vuorela <sune@vuorela.dk> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * moc: Fix Generator::registerableMetaTypeOlivier Goffart2013-05-201-0/+2
| | | | | | | | | | | | | | | | when the type is a pointer to a registerable 1 argument template type. Task-number: QTBUG-31002 Change-Id: Iac0d6b71b2b805a1876110a0781d02188083c4e5 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * moc: recover bad template parsing.Olivier Goffart2013-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering code such as: X<a<b> moc does not have the mean to know if 'a' is a type or a variable, so the type parser currently assume that '<' always open a template parameter. (instead of being the operator<) The type parser do not care about the actual type, it just need to strip the string out. The problem is that then the whole rest of the file will be considered as the type. With this patch, we also stop the parsing at semicolon. The type will be wrong, but this allow the parser to recover and it will continue to look for more classes after this. (In other words, moc will no longer break if it encounter such construct in a header. But it will still not parse such types correctly if used within a Q_OBJECT class) Task-number: QTBUG-31218 Change-Id: I1fef6bc58493d7c00df72401c9ad55463b24eaa7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * QtWidgets: avoid integer divide by zero in QProgressDialogLiang Qi2013-05-151-0/+11
| | | | | | | | | | | | | | | | Autotest is included. Task-number: QTBUG-31046 Change-Id: Ie549b59112f458de478294fa00443a3cf6898c85 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * QGV: fix items not to be selected on right mouse button releaseJ-P Nurmi2013-05-141-0/+28
| | | | | | | | | | | | | | Task-number: QTBUG-30990 Change-Id: I421d9169b592da2b468eceb9df4f3f7c6a06e8d6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * tst_qmdiarea: Prevent scrollbars from messing up expected viewport calculationTor Arne Vestbø2013-05-141-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With scrollbars enabled we would get two resize events when tiling the windows. First one with the expected viewport size, and then a second one with a bigger viewport when the QMdiArea calculated that the space it set off for scrollbars was not needed after all. Depending on whether or not the geometry propagation of the platform plugin was synchronous or not, we would get one or both of the events before evaluating the viewport size against the expected size, resulting in flakeyness, and an expected fail on OS X. We now explicitly disable the scrollbars during the test, and restore them for the latter test that verifies that scrollbars show up when the area is resized below the minimum size of the combined child widgets. This allows us to unskip the expected failure on OS X, and should make the test less flakey. Change-Id: Ief767456cfd79f5cd0bb0e220c40e5995674ff71 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * test: Remove XFAIL from tst_qwidgetSergio Ahumada2013-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | XPASS : tst_QWidget::update() QCOMPARE(w.numPaintEvents, 1) returned TRUE unexpectedly. Loc: [tst_qwidget.cpp(4017)] Change-Id: Ib7664871ed218f4c88fd2430491fa65443651927 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Disabling some concurrency in widget testsSimo Fält2013-05-102-2/+0
| | | | | | | | | | | | | | | | | | | | | | There has been frequent failures with CI, especially with OSX 10.7. These seems to work ok in CI node when ran alone but CI is running those in parallel with some other tests, and this is causing errors, most likely due to lost focus. Change-Id: Ic4151099c27a4b5d91778c9b13e88d2d661e8a0d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Rename Numpad to Num, ensure Numpad is translated in all cases on Mac.Mitch Curtis2013-05-101-4/+4
| | | | | | | | | | | | | | | | Numpad is unnecessarily long. Change-Id: I19a6ce129e26a4f6f8344f514317214c48abde6e Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
| * Make QFlags enum flags (C++11 strict enums) friendlyAlbert Astals Cid2013-05-091-0/+116
| | | | | | | | | | Change-Id: I9ccb3e4d281a545ca1845db4f6aa7ac6c04e8621 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Stabilize QGraphicsWidget test.Friedemann Kleint2013-05-091-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test showed frequent failures with XCB in initialShow2() (line 3200) after 01bc34088eb8e7fb4842fa1c2117cddbac086136 (QTBUG-30923) which can be fixed by ensuring the widget from the HFW-test is deleted. Use QScopedPointer to ensure widgets are always deleted in case of test failures, too. Task-number: QTBUG-20778 Task-number: QTBUG-30923 Change-Id: I2af7737b604820463f760d6b6787dd5a5a93d602 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Fix a case of connect()ing to signals declared in a base classOlivier Goffart2013-05-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix connection to pointer to member signal that belongs to the base class, but whose type is a pointer to a member of the derived class. The current code only use the QMetaObject of the type coming from the function type to look up the signal id. But if the signal was casted to a pointer to member function of a derived type, then we also need to look in the base classes Change-Id: Ib98fc38f63942946acb34d9f83c100991d58e4e5 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Revert QDateTime serialisation to pre-Qt 5 behaviour.Mitch Curtis2013-05-082-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 5, I managed to break the guarantee that a deserialised local datetime is the same time of day (potentially different UTC time), regardless of which timezone it was serialised in. This happened after I fixed QTBUG-4057 with If650e7960dca7b6ab44b8233410a6369c41df73a, which serialised datetimes as UTC. This patch reverts QDateTime serialisation to pre-Qt 5 behaviour to restore the guarantee and consequently re-opens QTBUG-4057. Change-Id: Iea877f7ed886f530b928067789b53534e89fe8cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix tabFocusFirst when that item is removed from QGraphicsSceneMiikka Heikkinen2013-05-081-0/+18
| | | | | | | | | | | | | | | | | | | | If tabFocusFirst is not cleared or set to another valid item, there will be crash later if the removed item is deleted after removal. Task-number: QTBUG-30923 Change-Id: Iba9a6ce9334c52f8e552b0accda95ebb5fcfcdb1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * QLocale: add autotest for French_Morocco localeEl Mehdi Fekari2013-05-081-0/+1
| | | | | | | | | | | | Change-Id: Ie489557342bf9ea571ba4070e8982b1a13fc7021 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * moc: use fprintf instead of qWarningOlivier Goffart2013-05-081-0/+5
| | | | | | | | | | | | | | | | | | qWarning now depends on QT_MESSAGE_PATTERN, depending on that variable. It will show things like the moc process id or the Parser::error function name. We don't want that. Change-Id: I5b35401200f0f7de2442aa77d700a82402081489 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Only expect EGL libraries in the cmake files if Qt is configured to use it.Stephen Kelly2013-05-071-1/+1
| | | | | | | | | | | | Change-Id: Ida382a80dba882bbeb920756adc0c16321efe37e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Add qt_hash(QStringRef) overloadGiuseppe D'Angelo2013-05-071-0/+22
| | | | | | | | | | | | | | | | This enables fixing a performance regression compared to Qt 4. Also, add some qt_hash tests. Change-Id: Id830e17dec99fb67e5930c80029ac2233b2f427e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fixed applying invalid data from QLineEdit to modelIvan Komissarov2013-05-071-0/+131
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-2216 Change-Id: I5d1c18aadb380667dedc2bb9f9b7e3dd8178a24c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: David Faure <david.faure@kdab.com>
| * Add QSKIP to hoverenter-test in tst_qgraphicsproxywidget.Friedemann Kleint2013-05-071-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-25294 Change-Id: I7a674dc49d84c7c68a877bcf64c14e9726dd481e Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Fix XPASS in tst_qgraphicswidget (Windows).Friedemann Kleint2013-05-071-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-20778 Change-Id: I90c8135fab85872cae22630c53fef7aed835a19c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * QProcess/Win: drain output pipes on process finishJoerg Bornemann2013-05-071-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | If a process dies before all output is read into the internal buffer of QProcess, we might lose data. Therefore we must drain the output pipes like we already do in the synchronous wait functions. Task-number: QTBUG-30843 Change-Id: I8bbc5265275c9ebd33218ba600267ae87d93ed61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Silently strip leading dot off QFileDialog default suffixes.Friedemann Kleint2013-05-211-0/+2
| | | | | | | | | | | | Change-Id: Ie41fafe8c2ce7e8ac8dd595ca3809c1da3b386f4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Make it possible to access QPair and std::pair elements from a QVariant.Stephen Kelly2013-05-201-0/+28
| | | | | | | | | | Change-Id: I9dc73748073d0d1e43bdadbce73339dfcc1bc647 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add container access functionality for associative containers in QVariant.Stephen Kelly2013-05-201-0/+85
| | | | | | | | | | Change-Id: I4763a4c157e52918a0a68cba63624c0649aca235 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Don't test QHash<float, U> or QHash<double, U>Stephen Kelly2013-05-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Although it is possible to construct those containers, they are not usable, as qHash(float) and qHash(double) are ambiguous. Also don't use CustomMovable as a container key. It is not equality or lessthan comparable. Change-Id: I8c7ee068250e2e2b3427769153e3017721c13c50 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Fix some data races in tst_qthreadpool.David Faure2013-05-191-16/+16
| | | | | | | | | | | | | | Detected by helgrind. Change-Id: I5f73a62610b4bdc7f26629f3dcf7b11467897a5c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | QSslConfiguration: add API to persist and resume SSL sessionsPeter Hartmann2013-05-101-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | Session tickets can be cached on the client side for hours (e.g. graph.facebook.com: ~ 24 hours, api.twitter.com: 4 hours), because the server does not need to maintain state. We need public API for it so an application can cache the session (e.g. to disk) and resume a session already with the 1st handshake, saving one network round trip. Task-number: QTBUG-20668 Change-Id: I10255932dcd528ee1231538cb72b52b97f9f4a3c Reviewed-by: Richard J. Moore <rich@kde.org>
* | QDBus: Add test for a{sv} and an annotation pointing to QVariantHash.David Faure2013-05-103-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | QVariantMap would work too; I presume this is why the annotation is needed, rather than QtDBus automatically figuring out which type to use. This even checks that QHash&lt;QString,QVariant&gt; works in the annotation, although QVariantHash would be simpler to write, obviously. Change-Id: I7a339ca90f10e5ec97dcea1bb4dbba3c515e6b23 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>