diff options
author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
tree | c0394c9cd5ce51961337a7a15e169074dd41632b /tests/auto/designer/designer.pro | |
parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'tests/auto/designer/designer.pro')
-rw-r--r-- | tests/auto/designer/designer.pro | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/designer/designer.pro b/tests/auto/designer/designer.pro new file mode 100644 index 00000000..68fbc747 --- /dev/null +++ b/tests/auto/designer/designer.pro @@ -0,0 +1,9 @@ +TEMPLATE = app +TARGET = tst_designer + +QT += quick quick-private quickcontrols2 testlib +CONFIG += testcase +macos:CONFIG -= app_bundle + +SOURCES += \ + $$PWD/tst_designer.cpp |