diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:19:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 16:05:53 +0200 |
| commit | c2b224a758ce7e6dcf3748444fa8e29ab81904be (patch) | |
| tree | 277cb99bf054190c935579142506caa4ec9861dd /tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | |
| parent | 10de063ff12cdba07b4620182aced8ed05ee3505 (diff) | |
| parent | eaee1209f0ead5be786e81db8aee604ccfea85b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
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
Diffstat (limited to 'tests/auto/gui/kernel/qwindow/tst_qwindow.cpp')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 2d32876a8d..9ef8699164 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -1644,7 +1644,7 @@ void tst_QWindow::inputReentrancy() QCOMPARE(window.touchReleasedCount, 1); } -#ifndef QT_NO_TABLETEVENT +#if QT_CONFIG(tabletevent) class TabletTestWindow : public QWindow { public: @@ -1672,7 +1672,7 @@ public: void tst_QWindow::tabletEvents() { -#ifndef QT_NO_TABLETEVENT +#if QT_CONFIG(tabletevent) TabletTestWindow window; window.setGeometry(QRect(m_availableTopLeft + QPoint(10, 10), m_testWindowSize)); qGuiApp->installEventFilter(&window); |