diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-12 14:34:28 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2014-09-15 12:10:01 +0200 |
commit | ca492c8facd3e7b086e17788aded1a8299353a85 (patch) | |
tree | 008617a0eebd87ff7e8ac0134dacd896744da131 /tests | |
parent | 7dbb9b267865bdaeb9cdd07b4d554f31dfd88305 (diff) |
use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.
Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'tests')
20 files changed, 20 insertions, 20 deletions
diff --git a/tests/auto/cplusplus/c99/c99.pro b/tests/auto/cplusplus/c99/c99.pro index b40c99036db..601c3f82f5d 100644 --- a/tests/auto/cplusplus/c99/c99.pro +++ b/tests/auto/cplusplus/c99/c99.pro @@ -4,5 +4,5 @@ include(../shared/shared.pri) DEFINES += SRCDIR=\\\"$$PWD\\\" SOURCES += tst_c99.cpp -OTHER_FILES += \ +DISTFILES += \ data/designatedInitializer.1.c diff --git a/tests/auto/cplusplus/cxx11/cxx11.pro b/tests/auto/cplusplus/cxx11/cxx11.pro index 891094408a0..f1b414bc784 100644 --- a/tests/auto/cplusplus/cxx11/cxx11.pro +++ b/tests/auto/cplusplus/cxx11/cxx11.pro @@ -4,7 +4,7 @@ include(../shared/shared.pri) DEFINES += SRCDIR=\\\"$$PWD\\\" SOURCES += tst_cxx11.cpp -OTHER_FILES += \ +DISTFILES += \ data/inlineNamespace.1.cpp \ data/inlineNamespace.1.errors.txt \ data/staticAssert.1.cpp \ diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro index 17ca6239aac..9d2fed34b86 100644 --- a/tests/auto/cplusplus/preprocessor/preprocessor.pro +++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro @@ -4,7 +4,7 @@ include(../shared/shared.pri) DEFINES += SRCDIR=\\\"$$PWD\\\" SOURCES += tst_preprocessor.cpp -OTHER_FILES = \ +DISTFILES = \ data/noPP.1.cpp \ data/noPP.2.cpp \ data/identifier-expansion.1.cpp data/identifier-expansion.1.out.cpp \ diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro index 92f0c6c8310..6afe681a8b3 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro @@ -4,7 +4,7 @@ SOURCES += plugin1.cpp HEADERS += plugin1.h DEFINES += PLUGIN1_LIBRARY -OTHER_FILES = $$PWD/plugin.json +DISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro index c2c5baf51d7..ce8fe64d550 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro @@ -4,7 +4,7 @@ SOURCES += plugin2.cpp HEADERS += plugin2.h DEFINES += PLUGIN2_LIBRARY -OTHER_FILES = $$PWD/plugin.json +DISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro index 2ec06c35db3..f828f6571d7 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro @@ -4,7 +4,7 @@ SOURCES += plugin3.cpp HEADERS += plugin3.h DEFINES += PLUGIN3_LIBRARY -OTHER_FILES = $$PWD/plugin.json +ODISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../../../qtcreator.pri) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro index e777d0aa7f7..1b05d06de67 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro @@ -4,7 +4,7 @@ SOURCES += plugin1.cpp HEADERS += plugin1.h DEFINES += PLUGIN1_LIBRARY -OTHER_FILES = $$PWD/plugin.json +DISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro index a2eba0cada2..3ec652ccf99 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro @@ -4,7 +4,7 @@ SOURCES += plugin2.cpp HEADERS += plugin2.h DEFINES += PLUGIN2_LIBRARY -OTHER_FILES = $$PWD/plugin.json +DISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro index 21a3a92db89..e31ae56089d 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro @@ -4,7 +4,7 @@ SOURCES += plugin3.cpp HEADERS += plugin3.h DEFINES += PLUGIN3_LIBRARY -OTHER_FILES = $$PWD/plugin.json +DISTFILES = $$PWD/plugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../qttest.pri) diff --git a/tests/auto/extensionsystem/pluginspec/test.pro b/tests/auto/extensionsystem/pluginspec/test.pro index df398b1fabc..2a24f0d3376 100644 --- a/tests/auto/extensionsystem/pluginspec/test.pro +++ b/tests/auto/extensionsystem/pluginspec/test.pro @@ -3,7 +3,7 @@ TARGET = pluginspec # Input SOURCES += tst_pluginspec.cpp -OTHER_FILES += \ +DISTFILES += \ $$PWD/testspecs/simplespec.json \ $$PWD/testspecs/simplespec_experimental.json \ $$PWD/testspecs/spec1.json \ diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro index c52eec0dc49..7f46e9212f0 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro @@ -3,7 +3,7 @@ DEFINES += MYPLUGIN_LIBRARY SOURCES += testplugin.cpp HEADERS += testplugin.h testplugin_global.h -OTHER_FILES += testplugin.json +DISTFILES += testplugin.json QTC_LIB_DEPENDS += extensionsystem include(../../../../../qtcreator.pri) diff --git a/tests/auto/filesearch/filesearch.pro b/tests/auto/filesearch/filesearch.pro index 0ed02be4d64..1d89df5df64 100644 --- a/tests/auto/filesearch/filesearch.pro +++ b/tests/auto/filesearch/filesearch.pro @@ -4,6 +4,6 @@ include(../qttest.pri) # Input SOURCES += tst_filesearch.cpp -OTHER_FILES += testfile.txt +DISTFILES += testfile.txt RESOURCES += tst_filesearch.qrc diff --git a/tests/auto/qml/persistenttrie/persistenttrie.pro b/tests/auto/qml/persistenttrie/persistenttrie.pro index 46b0c701cea..ccaa5da46a7 100644 --- a/tests/auto/qml/persistenttrie/persistenttrie.pro +++ b/tests/auto/qml/persistenttrie/persistenttrie.pro @@ -14,7 +14,7 @@ SOURCES += \ TEMPLATE = app DEFINES += QMLJS_BUILD_DIR -OTHER_FILES += \ +DISTFILES += \ listAll.data \ intersect.data \ merge.data \ diff --git a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro index c80b437af3f..d9264674564 100644 --- a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro +++ b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro @@ -12,7 +12,7 @@ SOURCES += tst_qmllookup.cpp RESOURCES += testfiles.qrc -OTHER_FILES += \ +DISTFILES += \ data/localIdLookup.qml \ data/localScriptMethodLookup.qml \ data/localScopeLookup.qml \ diff --git a/tests/manual/debugger/qquick1/app.pro b/tests/manual/debugger/qquick1/app.pro index ecd58354f3e..71a8760f0db 100644 --- a/tests/manual/debugger/qquick1/app.pro +++ b/tests/manual/debugger/qquick1/app.pro @@ -6,7 +6,7 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" SOURCES += main.cpp -OTHER_FILES += qml/main.qml +DISTFILES += qml/main.qml qml.files = qml qml.path = . diff --git a/tests/manual/debugger/qquick1/myplugin/myplugin.pro b/tests/manual/debugger/qquick1/myplugin/myplugin.pro index 09116f6977b..e93564c926e 100644 --- a/tests/manual/debugger/qquick1/myplugin/myplugin.pro +++ b/tests/manual/debugger/qquick1/myplugin/myplugin.pro @@ -15,7 +15,7 @@ HEADERS += \ myplugin.h \ mytype.h -OTHER_FILES = qmldir +DISTFILES = qmldir !equals(_PRO_FILE_PWD_, $$OUT_PWD) { copy_qmldir.target = $$OUT_PWD/qmldir diff --git a/tests/manual/debugger/qquick2/myplugin/myplugin.pro b/tests/manual/debugger/qquick2/myplugin/myplugin.pro index 5b8c5d15104..e8748cbe676 100644 --- a/tests/manual/debugger/qquick2/myplugin/myplugin.pro +++ b/tests/manual/debugger/qquick2/myplugin/myplugin.pro @@ -15,7 +15,7 @@ HEADERS += \ myplugin.h \ mytype.h -OTHER_FILES = qmldir +DISTFILES = qmldir !equals(_PRO_FILE_PWD_, $$OUT_PWD) { copy_qmldir.target = $$OUT_PWD/qmldir diff --git a/tests/manual/qt4projectmanager/projecttree/projecttree.pro b/tests/manual/qt4projectmanager/projecttree/projecttree.pro index ec8fdc57013..b613c943659 100644 --- a/tests/manual/qt4projectmanager/projecttree/projecttree.pro +++ b/tests/manual/qt4projectmanager/projecttree/projecttree.pro @@ -45,4 +45,4 @@ HEADERS += main.h\ FORMS += widget.ui RESOURCES += resource.qrc -OTHER_FILES += foo.txt +DISTFILES += foo.txt diff --git a/tests/manual/search/search.pro b/tests/manual/search/search.pro index 7c382caa325..71c81002792 100644 --- a/tests/manual/search/search.pro +++ b/tests/manual/search/search.pro @@ -1 +1 @@ -OTHER_FILES = latin1.txt +DISTFILES = latin1.txt diff --git a/tests/tools/qtquickappblaster/qtquickappblaster.pro b/tests/tools/qtquickappblaster/qtquickappblaster.pro index e758a2ff34d..a08703bbd2c 100644 --- a/tests/tools/qtquickappblaster/qtquickappblaster.pro +++ b/tests/tools/qtquickappblaster/qtquickappblaster.pro @@ -14,6 +14,6 @@ SOURCES += \ main.cpp \ $$CREATORSOURCEDIR/tests/manual/appwizards/helpers.cpp INCLUDEPATH += $$APPSOURCEDIR -OTHER_FILES = qtquickapps.xml +DISTFILES = qtquickapps.xml RESOURCES += \ qtquickappblaster.qrc |