diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /src/testlib | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 9 | ||||
| -rw-r--r-- | src/testlib/qtestmouse.h | 2 | ||||
| -rw-r--r-- | src/testlib/testlib.pro | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 52a9977bbf..bfeca08617 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -107,6 +107,15 @@ static QSet<QByteArray> keywords() #endif #ifdef Q_CC_MSVC << "msvc" + #ifdef _MSC_VER + #if _MSC_VER == 1800 + << "msvc-2013" + #elif _MSC_VER == 1700 + << "msvc-2012" + #elif _MSC_VER == 1600 + << "msvc-2010" + #endif + #endif #endif #ifdef Q_AUTOTEST_EXPORT diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 8e1b04e0a0..2cf84a7ea0 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -98,7 +98,7 @@ namespace QTest mouseEvent(MouseRelease, window, button, stateKey, pos); return; } - QTEST_ASSERT(stateKey == 0 || stateKey & Qt::KeyboardModifierMask); + QTEST_ASSERT(uint(stateKey) == 0 || stateKey & Qt::KeyboardModifierMask); stateKey &= static_cast<unsigned int>(Qt::KeyboardModifierMask); diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 841d913105..52bcdd097b 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -64,8 +64,7 @@ DEFINES *= QT_NO_CAST_TO_ASCII \ QT_NO_CAST_FROM_ASCII \ QT_NO_DATASTREAM embedded:QMAKE_CXXFLAGS += -fno-rtti -wince*::LIBS += libcmt.lib \ - corelibc.lib \ +wince: LIBS += \ ole32.lib \ oleaut32.lib \ uuid.lib \ @@ -97,4 +96,9 @@ mac { } } +# Exclude these headers from the clean check if their dependencies aren't +# being built +contains(QT_CONFIG, no-widgets): HEADERSCLEAN_EXCLUDE += qtest_widgets.h +contains(QT_CONFIG, no-gui): HEADERSCLEAN_EXCLUDE += qtest_gui.h + load(qt_module) |