summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-07-01 18:41:14 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-07-01 18:41:14 +0200
commite6a94778d0c26b59e367e9f9fe4f401725fc9c4e (patch)
treec7597213d7eac14863bc3cfd7bccd247c8950710 /tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
parent605ba2c2268b2dce3d0b06899101d03a67e7f251 (diff)
parenta09a8d509a69ed16d8afbe15296b8332cacd6c66 (diff)
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro')
-rw-r--r--tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
index 8d117793bf..f5d06b3de9 100644
--- a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
+++ b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
@@ -4,7 +4,7 @@ CONFIG += ordered
SUBDIRS = lib \
theplugin \
tst
-!win32: !mac: SUBDIRS += almostplugin
+!android: !win32: !mac: SUBDIRS += almostplugin
macx-*: SUBDIRS += machtest
TARGET = tst_qpluginloader