diff --git a/src/plugins/autotest/CMakeLists.txt b/src/plugins/autotest/CMakeLists.txt
index 01d6c39fa4c..eea4e68b345 100644
--- a/src/plugins/autotest/CMakeLists.txt
+++ b/src/plugins/autotest/CMakeLists.txt
@@ -3,13 +3,11 @@ add_qtc_plugin(AutoTest
PLUGIN_DEPENDS Core CppEditor Debugger ProjectExplorer QmlJSTools TextEditor
PLUGIN_TEST_DEPENDS QmakeProjectManager QtSupport QbsProjectManager
SOURCES
- autotest.qrc
autotest_global.h
autotesttr.h
autotestconstants.h
autotesticons.h
autotestplugin.cpp autotestplugin.h
- autotestunittests.qrc
boost/boostcodeparser.cpp boost/boostcodeparser.h
boost/boosttestconfiguration.cpp boost/boosttestconfiguration.h
boost/boosttestconstants.h
@@ -85,3 +83,16 @@ extend_qtc_plugin(AutoTest
autotestunittests.cpp autotestunittests.h
loadprojectscenario.cpp loadprojectscenario.h
)
+
+file(GLOB_RECURSE images RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} images/*)
+qtc_add_resources(AutoTest "images"
+ PREFIX "/autotest"
+ BASE "."
+ FILES ${images}
+)
+file(GLOB_RECURSE test_cases RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} unit_test/*)
+qtc_add_resources(AutoTest "testcases"
+ CONDITION WITH_TESTS
+ BASE "."
+ FILES ${test_cases}
+)
diff --git a/src/plugins/autotest/autotest.qbs b/src/plugins/autotest/autotest.qbs
index 9e9625006b6..b335a4fe07b 100644
--- a/src/plugins/autotest/autotest.qbs
+++ b/src/plugins/autotest/autotest.qbs
@@ -20,8 +20,9 @@ QtcPlugin {
Depends { name: "Qt.testlib"; condition: qtc.withPluginTests }
Depends { name: "Qt.widgets" }
+ Qt.core.resourceSourceBase: sourceDirectory
+
files: [
- "autotest.qrc",
"autotesticons.h",
"autotest_global.h", "autotesttr.h",
"autotestconstants.h",
@@ -119,12 +120,24 @@ QtcPlugin {
files: [
"autotestunittests.cpp",
"autotestunittests.h",
- "autotestunittests.qrc",
"loadprojectscenario.cpp",
"loadprojectscenario.h",
]
}
+ Group {
+ name: "test data"
+ files: "unit_test/**/*"
+ fileTags: qtc.withPluginTests ? ["qt.core.resource_data"] : []
+ }
+
+ Group {
+ name: "images"
+ files: "images/*.png"
+ fileTags: "qt.core.resource_data"
+ Qt.core.resourcePrefix: "autotest"
+ }
+
Group {
name: "Auto Test Wizard"
prefix: "../../shared/autotest/"
diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc
deleted file mode 100644
index 4651a582973..00000000000
--- a/src/plugins/autotest/autotest.qrc
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- images/settingscategory_autotest.png
- images/settingscategory_autotest@2x.png
- images/leafsort.png
- images/leafsort@2x.png
- images/data.png
- images/data@2x.png
- images/text.png
- images/text@2x.png
- images/visual.png
- images/visual@2x.png
- images/suite.png
- images/suite@2x.png
-
-
diff --git a/src/plugins/autotest/autotestunittests.qrc b/src/plugins/autotest/autotestunittests.qrc
deleted file mode 100644
index 13db89f567a..00000000000
--- a/src/plugins/autotest/autotestunittests.qrc
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
- unit_test/mixed_atp/src/main.cpp
- unit_test/mixed_atp/tests/auto/bench/tst_benchtest.cpp
- unit_test/mixed_atp/tests/auto/dummy/tst_foo.cpp
- unit_test/mixed_atp/tests/auto/dummy/tst_foo.h
- unit_test/mixed_atp/tests/auto/gui/tst_guitest.cpp
- unit_test/mixed_atp/tests/auto/quickauto/bar/tst_foo.qml
- unit_test/mixed_atp/tests/auto/quickauto/notlisted/tst_bla.qml
- unit_test/mixed_atp/tests/auto/quickauto/main.cpp
- unit_test/mixed_atp/tests/auto/quickauto/TestDummy.qml
- unit_test/mixed_atp/tests/auto/quickauto/tst_test1.qml
- unit_test/mixed_atp/tests/auto/quickauto/tst_test2.qml
- unit_test/mixed_atp/tests/auto/quickauto/tst_test3.qml
- unit_test/mixed_atp/tests/auto/quickauto2/main.cpp
- unit_test/mixed_atp/tests/auto/quickauto2/tst_test1.qml
- unit_test/mixed_atp/tests/auto/quickauto2/tst_test2.qml
- unit_test/plain/test_plain/tst_simple.cpp
- unit_test/plain/test_plain/tst_simple.h
- unit_test/plain/plain.pro
- unit_test/mixed_atp/mixed_atp.pro
- unit_test/plain/test_plain/test_plain.pro
- unit_test/mixed_atp/tests/tests.pro
- unit_test/mixed_atp/src/src.pro
- unit_test/mixed_atp/tests/auto/bench/bench.pro
- unit_test/mixed_atp/tests/auto/dummy/dummy.pro
- unit_test/mixed_atp/tests/auto/gui/gui.pro
- unit_test/mixed_atp/tests/auto/quickauto/quickauto.pro
- unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.pro
- unit_test/mixed_atp/tests/auto/auto.pro
- unit_test/plain/plain.qbs
- unit_test/plain/test_plain/test_plain.qbs
- unit_test/mixed_atp/mixed_atp.qbs
- unit_test/mixed_atp/src/src.qbs
- unit_test/mixed_atp/tests/tests.qbs
- unit_test/mixed_atp/tests/auto/auto.qbs
- unit_test/mixed_atp/tests/auto/bench/bench.qbs
- unit_test/mixed_atp/tests/auto/dummy/dummy.qbs
- unit_test/mixed_atp/tests/auto/gui/gui.qbs
- unit_test/mixed_atp/tests/auto/quickauto/quickauto.qbs
- unit_test/mixed_atp/tests/auto/quickauto2/quickauto2.qbs
- unit_test/mixed_atp/tests/auto/derived/derived.pro
- unit_test/mixed_atp/tests/auto/derived/derived.qbs
- unit_test/mixed_atp/tests/auto/derived/origin.h
- unit_test/mixed_atp/tests/auto/derived/origin.cpp
- unit_test/mixed_atp/tests/auto/derived/tst_derivedtest.cpp
- unit_test/simple_gt/src/main.cpp
- unit_test/simple_gt/src/src.pro
- unit_test/simple_gt/src/src.qbs
- unit_test/simple_gt/tests/gt1/further.cpp
- unit_test/simple_gt/tests/gt1/gt1.pro
- unit_test/simple_gt/tests/gt1/gt1.qbs
- unit_test/simple_gt/tests/gt1/main.cpp
- unit_test/simple_gt/tests/gt2/gt2.pro
- unit_test/simple_gt/tests/gt2/gt2.qbs
- unit_test/simple_gt/tests/gt2/main.cpp
- unit_test/simple_gt/tests/gt2/queuetest.h
- unit_test/simple_gt/tests/tests.pro
- unit_test/simple_gt/tests/tests.qbs
- unit_test/simple_gt/simple_gt.pro
- unit_test/simple_gt/simple_gt.qbs
- unit_test/simple_gt/tests/gtest_dependency.pri
- unit_test/simple_gt/tests/gt3/dummytest.h
- unit_test/simple_gt/tests/gt3/gt3.pro
- unit_test/simple_gt/tests/gt3/gt3.qbs
- unit_test/simple_gt/tests/gt3/main.cpp
- unit_test/simple_gt/tests/common/functions.js
- unit_test/mixed_atp/tests/auto/quickauto3/Bar.qml
- unit_test/mixed_atp/tests/auto/quickauto3/Foo.qml
- unit_test/mixed_atp/tests/auto/quickauto3/main.cpp
- unit_test/mixed_atp/tests/auto/quickauto3/quickauto3.pro
- unit_test/mixed_atp/tests/auto/quickauto3/quickauto3.qbs
- unit_test/mixed_atp/tests/auto/quickauto3/tst_test1.qml
- unit_test/mixed_atp/tests/auto/quickauto3/tst_test2.qml
- unit_test/simple_boost/simple_boost.pro
- unit_test/simple_boost/simple_boost.qbs
- unit_test/simple_boost/src/main.cpp
- unit_test/simple_boost/src/src.pro
- unit_test/simple_boost/src/src.qbs
- unit_test/simple_boost/tests/tests.pro
- unit_test/simple_boost/tests/tests.qbs
- unit_test/simple_boost/tests/deco/deco.pro
- unit_test/simple_boost/tests/deco/deco.qbs
- unit_test/simple_boost/tests/deco/enab.h
- unit_test/simple_boost/tests/deco/main.cpp
- unit_test/simple_boost/tests/fix/fix.cpp
- unit_test/simple_boost/tests/fix/fix.pro
- unit_test/simple_boost/tests/fix/fix.qbs
- unit_test/simple_boost/tests/params/main.cpp
- unit_test/simple_boost/tests/params/params.pro
- unit_test/simple_boost/tests/params/params.qbs
-
-