diff options
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader')
6 files changed, 0 insertions, 32 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt index 74945fc6d8..dddd7cb953 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt @@ -22,12 +22,6 @@ add_cmake_library(tst_qpluginloaderlib ## Scopes: ##################################################################### -#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): -# DESTDIR = "../debug/bin" - -#### Keys ignored in scope 7:.:..:../winrt.pri:else: -# DESTDIR = "../release/bin" - extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index 8d723cf3ce..aa980eabaa 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -22,12 +22,6 @@ add_cmake_library(tst_qpluginloaderlib ## Scopes: ##################################################################### -#### Keys ignored in scope 6:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): -# DESTDIR = "../debug/bin" - -#### Keys ignored in scope 7:.:..:../winrt.pri:else: -# DESTDIR = "../release/bin" - extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro index 9fc76a4201..aa72a80559 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro +++ b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro @@ -4,7 +4,6 @@ CONFIG -= staticlib SOURCES = mylib.c TARGET = tst_qpluginloaderlib DESTDIR = ../bin -winrt:include(../winrt.pri) QT = core msvc: DEFINES += WIN32_MSVC diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt index 5389790fba..83f5f0605e 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt @@ -19,13 +19,4 @@ add_cmake_library(theplugin # TEMPLATE = "lib" # target.path = "$$[QT_INSTALL_TESTS]/tst_qpluginloader/bin" -## Scopes: -##################################################################### - -#### Keys ignored in scope 5:.:..:../winrt.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): -# DESTDIR = "../debug/bin" - -#### Keys ignored in scope 6:.:..:../winrt.pri:else: -# DESTDIR = "../release/bin" - qt_autogen_tools_initial_setup(theplugin) diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro index 6aa8161699..6ec4a8de05 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro @@ -6,7 +6,6 @@ SOURCES = theplugin.cpp #TARGET = $$qtLibraryTarget(theplugin) TARGET = theplugin DESTDIR = ../bin -winrt:include(../winrt.pri) QT = core # This is testdata for the tst_qpluginloader test. diff --git a/tests/auto/corelib/plugin/qpluginloader/winrt.pri b/tests/auto/corelib/plugin/qpluginloader/winrt.pri deleted file mode 100644 index 31602634b2..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/winrt.pri +++ /dev/null @@ -1,9 +0,0 @@ -# We cannot use TESTDATA as plugins have to reside physically -# inside the package directory -winrt { - CONFIG(debug, debug|release) { - DESTDIR = ../debug/bin - } else { - DESTDIR = ../release/bin - } -} |