summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
Commit message (Collapse)AuthorAgeFilesLines
* Remove references to obsolete platformsJake Petroules2017-11-051-4/+0
| | | | | | | | | | | | | | ultrix and reliant have not seen a release since 1995. dgux not since 2001. bsdi not since 2003. irix not since 2006. osf not since 2010. dynix... unclear, but no later than 2002. symbian needs no mention. All considered obsolete, all gone. sco and unixware are effectively obsolete. Remove them until someone expresses a real need. Change-Id: Ia3d9d370016adce9213ae5ad0ef965ef8de2a3ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.10' into devAllan Sandfeld Jensen2017-10-241-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/windows/qwindowsmousehandler.cpp src/plugins/platforms/xcb/qxcbimage.cpp tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/manual/qtabletevent/regular_widgets/main.cpp Done-with: Friedemann Kleint<Friedemann.Kleint@qt.io> Done-with: Mårten Nordheim<marten.nordheim@qt.io> Change-Id: I5b2499513a92c590ed0756f7d2e93c35a64b7f30
| * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-161-0/+2
| |\ | | | | | | | | | Change-Id: I3cf73c53cf131d0babfb558c2507bed0e0fc5f08
| | * Extend blacklisting of tst_gestures in RHELTony Sarajärvi2017-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This autotest has been blacklisted already in RHEL 7.1 and RHEL 7.2. This one extends it to 7.3 and 7.4. Task-number: QTBUG-52523 Change-Id: I3e2d8cd882d9f7dc58a65bde88e3aa16438b13c3 Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-173-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/fortuneclient/client.cpp examples/network/fortuneserver/server.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h src/plugins/platforms/cocoa/qcocoabackingstore.h src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoascreen.h src/plugins/platforms/ios/qiosbackingstore.h src/plugins/sqldrivers/oci/qsql_oci.cpp src/widgets/kernel/qwidgetwindow.cpp Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
| * | Ensure result of all QTest::qWaitFor are verifiedTor Arne Vestbø2017-10-053-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The qWaitFor functions themselves can not trigger a test failure, as that will not result in the test function exiting early, so every single call to qWaitFor needs to be wrapped in a QVERIFY. Change-Id: Id15a1549f31d06cdbf788e1d84ea431c28636ec8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Replace Q_DECL_OVERRIDE with override where possibleKevin Funk2017-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | | ModelTest: cleanupsGiuseppe D'Angelo2017-09-172-87/+89
|/ / | | | | | | | | | | | | | | | | | | | | In preparation to move the code into QTestLib proper. * Move to PMF-based connect() statements * Remove a bunch of commented out code * Streamline the logging of debugging / warnings, use categorized logging Change-Id: Iec0872b63959decce49487762472c9a82bcc9fa1 Reviewed-by: David Faure <david.faure@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devThiago Macieira2017-08-081-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/kernel/qwidget.cpp This merge also extends the expected output of the pairdiagnostics teamcity output (added in dev in commit c608ffc56ab37f9a9d5b9c34543126adb89e2b08) after the recent addition of the flowId attribute to the teamcity output (commit 8f036562119dd35ce51dc9230304d893b906bd37 in 5.9). Change-Id: I3868166e5efc45538544fffd14d8aba438f9173c
| * tst_qfocusevent activateWindow for Win 10Joni Jäntti2017-08-031-0/+9
| | | | | | | | | | | | | | | | | | This workaround was created to make tst_qfocusevent test pass on Windows 10 x64 Creators Update. Task-number: QTBUG-61467 Change-Id: I63eb149ae850174fb5de99761a6001e000a151a2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Ignore tests that fail on OpenNebulaFrederik Gladhorn2017-08-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | These tests need fixing, but they are already partially blacklisted and need investigation once the switch is completed. Task-number: QTQAINFRA-1292 Task-number: QTQAINFRA-1355 Task-number: QTQAINFRA-1362 Change-Id: Ic50d0c4a01ee7e72be1129d418eff244ba783185 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devOswald Buddenhagen2017-08-026-11/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/widgets/qdockarealayout.cpp src/widgets/widgets/qmainwindow.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmainwindowlayout_p.h tests/auto/corelib/tools/qlocale/tst_qlocale.cpp tests/auto/other/macnativeevents/BLACKLIST tests/auto/widgets/widgets/qmenu/BLACKLIST Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
| * Ignore tst_QFocusEvent failures on macOS 10.12Simon Hausmann2017-07-291-0/+5
| | | | | | | | | | | | Task-number: QTQAINFRA-1352 Change-Id: Ia5cad1af74a2ea581d768ce150e480f3a97b6495 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Ignore failure of qaccessbilitymac on macOS 10.12Simon Hausmann2017-07-291-0/+2
| | | | | | | | | | | | Task-number: QTQAINFRA-1351 Change-Id: I9b41e5664cdb6cedcb68be6197fc21b2cc45963d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Enrich tst_macNativeEvents blacklistSimon Hausmann2017-07-291-0/+16
| | | | | | | | | | | | | | | | Amends 0c7e4b97a7990b29255abaf4568f62b6a6b6c470 Task-number: QTQAINFRA-1292 Change-Id: I599dc1e7d39a96617d48fa32227093c8501b1323 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Blacklist tst_MacGui::nonModalOrderJędrzej Nowacki2017-07-272-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is marked as expected failure for the last 3 years, in CI it is proven to be somehow flaky and it is failing now because of XPASS which is not covered by blacklist feature. This patch extends efforts of 7eba6d039dfbb9377a4358842fcd7210dc1fdd86 and 03b4838cb51513bd5d2edf76dccc4bc4a1181681 by blacklisting the test completely. Change-Id: Ia295d61620fa6bc97b168d4de9456a18ed5c064f Task-number: QTQAINFRA-1333 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Convert features.dockwidget to QT_[REQUIRE_]CONFIGStephan Binner2017-07-251-2/+2
| | | | | | | | | | Change-Id: I1d4b0268df01f8bc0aec28af52cc4b639a376863 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Convert features.calendarwidget to QT_[REQUIRE_]CONFIGStephan Binner2017-07-251-2/+2
| | | | | | | | | | Change-Id: I93c2e00828a233f004c599bd0702d0a470ae29ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | macOS: Blacklist tst_MacNativeEvents::testKeyPressOnToplevel and friendsTor Arne Vestbø2017-07-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | They fail when enabling synchronous expose events. Disabled for now until we can look into why, but it's assumed to be an issue with the test harness/how we hook into Quartz to send/observe events. Task-number: QTBUG-62042 Change-Id: I723d049ec5d1029edb0ad3b1f47fffc829a8924b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-061-1/+2
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
| * Extend tst_macgui::nonModalOrder blacklist to include 10.12Simon Hausmann2017-07-041-1/+2
| | | | | | | | | | | | Change-Id: I9cfe9e8d79a3223c9cdbb039cc3e243b173f5e9c Task-number: QTQAINFRA-1333 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-042-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_unix.cpp src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/util/util.pri tests/auto/corelib/thread/qthread/qthread.pro tests/auto/corelib/thread/qthread/tst_qthread.cpp Change-Id: I5c45ab54d46d3c75a5c6c116777ebf5bc47a871b
| * Ignore tst_macNativeEvents::testPushButtonPressRelease on macOS 10.11Simon Hausmann2017-06-281-0/+3
| | | | | | | | | | | | Task-number: QTQAINFRA-1292 Change-Id: I1047b797380820d2636f4d514b41b621c7794486 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * winrt: Fix tst_qlanguagechangeOliver Wolff2017-06-191-1/+1
| | | | | | | | | | Change-Id: Ic11a81b49cc2e7a3fcb895d1556b44baf8c1d6fe Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Typo-fix: s/looses/loses/gEdward Welbourne2017-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When an archer lets go of the bow-string, she looses an arrow; when the hounds are straining at their leashes and the handler lets go, he looses the dogs. It's archaic usage now; we'd normally say "lets loose", "lets go" or "releases". In any case what was meant here was that something got lost; a widget loses focus or a network loses its connection. Change-Id: Ic1fbe9e1f76185bcb7caf034d6be97ebfeb2e270 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-076-21/+29
|\| | | | | | | | | | | | | Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
| * Do not always use argb32pm for subsurfacesAllan Sandfeld Jensen2017-05-316-21/+29
| | | | | | | | | | | | | | | | | | | | | | A number of drawing paths were never tested by lancelot because we always used argb32pm for subsurfaces. This patch switches the subsurfaces to use the painter format or its alpha version. This means changes to composition tests as it changes precision, especially of alpha in the a2rgb30 formats. Change-Id: I24d53bf6e1db8cca36bda69e2ddf07f20256b3c8 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Simplify code by factoring out brush transformation for gradientsEirik Aavitsland2017-05-153-0/+202
| | | | | | | | | | | | | | | | | | | | Emulation of non-logical coordinate mode gradients was implemented by essentially 3 x 2 repetitions of the same manipulation of the QBrush transform. Avoid the code duplication by extracting a common method. Add lancelot test scripts that excersizes these code paths. Change-Id: I7baa921923231ef9e83e443dba996b82b32ad1e7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-05-074-36/+2
|\| | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
| * Enable tst_qaccessibilitymacFrederik Gladhorn2017-05-043-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The test was disabled because it was checking if we had the right permissions. It does seem as if the permissions do not matter as long as everything is in process though. As seen by the regression in fafdb171e0c317ee8f871dc7b504d3713d5860eb it's important to run the test. This regression would have been caught. Change-Id: Ia1938e683badd1de2657aa6dc8a3b3bbe430e8c8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Blacklist tst_MacGui autotest in macOS 10.11Tony Sarajärvi2017-04-241-0/+2
| | | | | | | | | | | | Task-number: QTBUG-60385 Change-Id: I6e692ff55d26b9070343d612e2f872091d5c343d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-202-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
| * Fix tst_toolsupport on 32-bit arm platformSami Nurmenniemi2017-04-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit arm platform, qint64 gets aligned differently than on 32-bit x86. First difference between the platforms on QFilePrivate member offset happens in QFileDevicePrivate::cachedSize: - On 32-bit x86 it's offset is 148 (4-aligned) - On 32-bit arm it's offset is 152 (8-aligned) and offsets of all the remaining members are +4 compared to x86 - On 64-bit architectures the offsets are the same Change-Id: If110da27ea08504e78b167c0a21599420eaa9630 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * tst_QFocusEvent: Fix checkReason_ActivateWindow for offscreen and minimal ↵Sami Nurmenniemi2017-04-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | platforms Widgets in platforms offscreen and minimal don't get focus back automatically after hiding focused window. Extra activateWindow is needed. Task-number: QTBUG-59966 Change-Id: Iaf3d4e60483c4b2600472af199f7a7cd51b3fa6e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-071-17/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775
| * tests: Unify license to GPL-EXCEPTKai Koehne2017-04-031-17/+12
| | | | | | | | | | | | Change-Id: Ic718650a8a7bddd4ee28c5650a3f5baf70886e51 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-281-15/+16
|\| | | | | | | | | | | | | | | | | Conflicts: examples/examples.pro tests/auto/corelib/tools/qchar/tst_qchar.cpp tests/auto/other/qaccessibility/accessiblewidgets.h Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-271-18/+19
| |\ | | | | | | | | | Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8
| | * Mark some methods in test code as overridesEdward Welbourne2017-03-221-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CustomTextWidgetIface marked its text() method as an override; DropOnOddRows marked its canDropMimeData() as an override; each neglected some other methods that are overrides. Convert Q_DECL_OVERRIDE to the keyword in affected classes, to match. Change-Id: I78b38e20a81e3e6aab282a1cb3d70cdf8a5f4135 Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-206-15/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemengine_win.cpp src/gui/text/qdistancefield.cpp src/plugins/platforms/xcb/qxcbconnection.h Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e
| * | Add lancelot test to exercise tiled non-ARGB32PM bilinear filteringAllan Sandfeld Jensen2017-03-162-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | No test were hitting the code path for tiled non-ARGB32PM bilinear filtered scaling. In part because we were only using brushes in pixmap mode which are always converted to RGB32 or ARGB32PM. Change-Id: Ib466567f31ce6ee894acdf484d44b3af62dad6fc Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Skip tst_MacNativeEvents::testChildDialogInFrontOfModalParent()Tor Arne Vestbø2017-03-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing the dialog at the end of the test ends the modal session via QCocoaEventDispatcherPrivate::endModalSession(), but the actual ending of the session is deferred to cleanupModalSessions(), and that is never called. The result is that QCocoaWindow::setVisible of the window in testKeyPressOnToplevel and following tests ends up calling [m_nsWindow orderFront:nil]; instead of [m_nsWindow makeKeyAndOrderFront:nil];, leaving the window inactive and the tests failing. Task-number: QTBUG-58474 Change-Id: If66b2e201f658b627c2ec50a562938f59a5037ed Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-133-9/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
| | * Properly use the "process" featureUlf Hermann2017-02-273-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all QT_NO_PROCESS with QT_CONFIG(process), define it in qconfig-bootstrapped.h, add QT_REQUIRE_CONFIG(process) to the qprocess headers, exclude the sources from compilation when switched off, guard header inclusions in places where compilation without QProcess seems supported, drop some unused includes, and fix some tests that were apparently designed to work with QT_NO_PROCESS but failed to. Change-Id: Ieceea2504dea6fdf43b81c7c6b65c547b01b9714 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Remove remaining Carbon includes from QtCore, QtGui and QtWidgetsJake Petroules2017-03-074-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Carbon is deprecated and we should not rely on it at runtime or compile time. These headers were only included for a small collection of keyboard key constants which have now been hardcoded instead. Change-Id: Ia2eaa267584b63be8019be3bbf64cba897a985a8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Remove Carbon API usage from tst_qmacnativeeventsJake Petroules2017-03-073-37/+11
| | | | | | | | | | | | | | | | | | | | | These code paths are actually never exercised at all. Change-Id: I95a5cfa0173e265573c30378ec2e03a2ddf954e4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Tests: Fix Clang warnings about inconsistent overrideFriedemann Kleint2017-02-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qsortfilterproxymodel.cpp:3997:14: warning: 'data' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] tst_qsortfilterproxymodel.cpp:4004:9: warning: 'rowCount' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] accessiblewidgets.h:101:11: warning: 'interface_cast' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] accessiblewidgets.h:115:13: warning: 'textBeforeOffset' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] accessiblewidgets.h:121:13: warning: 'textAtOffset' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] Change-Id: I75ba00a0109ff25a2a22554980b8e541e661f806 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | modeltest: improve debuggingDavid Faure2017-02-021-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | - QCOMPARE takes (actual, expected) rather than the other way around - Added a qWarning with more details before a QVERIFY Change-Id: I0a903a54db28ff2de1f684a2dd9abba3660ee916 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | modeltest: code reformatting to the Qt coding style, using uncrustifyDavid Faure2017-02-025-460/+463
|/ / | | | | | | | | Change-Id: I39026fe0dbc0dacfada5ec2dc6dd81f20b05967c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 19:54:25 +0000