summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/global/qlogging/test
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-06-30 22:59:21 +0200
committerLiang Qi <liang.qi@qt.io>2018-07-02 11:23:45 +0200
commite3ed2281c0c891cf3b15c95f9f7cdae42e9f233a (patch)
treeaae8da6ce616eae02b69fb1fcdcb4383c8fe6811 /tests/auto/corelib/global/qlogging/test
parent3be141d5bc199080b524d8f6f5ce514e8f74d23a (diff)
parente75e4b39b78ba05ea2cd45dc96acf99fc89c5915 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: MÃ¥rten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
Diffstat (limited to 'tests/auto/corelib/global/qlogging/test')
-rw-r--r--tests/auto/corelib/global/qlogging/test/test.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/global/qlogging/test/test.pro b/tests/auto/corelib/global/qlogging/test/test.pro
index 8dafc4509c..91896d4494 100644
--- a/tests/auto/corelib/global/qlogging/test/test.pro
+++ b/tests/auto/corelib/global/qlogging/test/test.pro
@@ -4,14 +4,14 @@ qtConfig(c++14): CONFIG += c++14
debug_and_release {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../debug/helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../debug/helper
} else {
TARGET = ../../release/tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../release/helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../release/helper
}
} else {
TARGET = ../tst_qlogging
- !winrt: TEST_HELPER_INSTALLS = ../helper
+ !android:!winrt: TEST_HELPER_INSTALLS = ../helper
}
QT = core testlib