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>

43 files changed, 45 insertions, 45 deletions

diff --git a/bin/bin.pro b/bin/bin.pro
index 45cf041db0..5f17ff9fd5 100644
--- a/bin/bin.pro
+++ b/bin/bin.pro
@@ -13,4 +13,4 @@ QMAKE_CLEAN = qtcreator.sh
 target.path  = $$QTC_PREFIX/bin
 INSTALLS    += target
 
-OTHER_FILES = $$PWD/qtcreator.sh
+DISTFILES = $$PWD/qtcreator.sh
diff --git a/doc/doc.pri b/doc/doc.pri
index 7fcb3bc7e1..fa52a5c602 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -87,7 +87,7 @@ docs_online.depends = html_docs_online dev_html_docs_online
 docs.depends = qch_docs dev_qch_docs
 QMAKE_EXTRA_TARGETS += html_docs dev_html_docs html_docs_online dev_html_docs_online qch_docs dev_qch_docs docs docs_online
 
-OTHER_FILES = $$HELP_DEP_FILES $$DEV_HELP_DEP_FILES
+DISTFILES = $$HELP_DEP_FILES $$DEV_HELP_DEP_FILES
 
 fixnavi.commands = \
     cd $$shell_path($$PWD) && \
diff --git a/qtcreator.pri b/qtcreator.pri
index 56a9e64abe..6569cb65ee 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -144,7 +144,7 @@ qt {
 }
 
 QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs)
-exists($$QBSFILE):OTHER_FILES += $$QBSFILE
+exists($$QBSFILE):DISTFILES += $$QBSFILE
 
 !isEmpty(QTC_PLUGIN_DEPENDS):LIBS *= -L$$IDE_PLUGIN_PATH
 # recursively resolve plugin deps
diff --git a/qtcreator.pro b/qtcreator.pro
index 5034b1bcbd..67b2553b76 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -15,7 +15,7 @@ SUBDIRS = src share
 unix:!macx:!isEmpty(copydata):SUBDIRS += bin
 !isEmpty(BUILD_TESTS):SUBDIRS += tests
 
-OTHER_FILES += dist/copyright_template.txt \
+DISTFILES += dist/copyright_template.txt \
     $$files(dist/changes-*) \
     qtcreator.qbs \
     qbs/pluginjson/pluginjson.qbs \
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
index b907cc8c0a..2837ccd4b5 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -38,7 +38,7 @@ SOURCES +=  $$PWD/qml2puppetmain.cpp
 RESOURCES +=  $$PWD/../qmlpuppet.qrc
 DEFINES -= QT_NO_CAST_FROM_ASCII
 
-OTHER_FILES += Info.plist
+DISTFILES += Info.plist
 
 unix:!osx:LIBS += -lrt # posix shared memory
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
index 03c0f1fe04..0f6b2284fe 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
@@ -26,7 +26,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
 
 unix:!macx:LIBS += -lrt # posix shared memory
 
-OTHER_FILES += Info.plist
+DISTFILES += Info.plist
 macx {
     CONFIG -= app_bundle
     QMAKE_LFLAGS += -sectcreate __TEXT __info_plist \"$$PWD/Info.plist\"
diff --git a/share/share.pro b/share/share.pro
index aa8c26680a..0ea55635f0 100644
--- a/share/share.pro
+++ b/share/share.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
           qtcreator/translations
-OTHER_FILES += share.qbs \
+DISTFILES += share.qbs \
     ../src/share/share.qbs
diff --git a/src/app/app.pro b/src/app/app.pro
index 249960f125..4738cff313 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -35,7 +35,7 @@ win32 {
     INSTALLS    += target
 }
 
-OTHER_FILES += qtcreator.rc \
+DISTFILES += qtcreator.rc \
     Info.plist.in \
     $$PWD/app_version.h.in
 
diff --git a/src/libs/glsl/glsl-lib.pri b/src/libs/glsl/glsl-lib.pri
index 27dfb2e541..f364ccb553 100644
--- a/src/libs/glsl/glsl-lib.pri
+++ b/src/libs/glsl/glsl-lib.pri
@@ -6,4 +6,4 @@ SOURCES += $$PWD/glslkeywords.cpp $$PWD/glslparser.cpp $$PWD/glslparsertable.cpp
     $$PWD/glslastvisitor.cpp $$PWD/glslengine.cpp $$PWD/glslmemorypool.cpp $$PWD/glslastdump.cpp \
     $$PWD/glslsemantic.cpp $$PWD/glsltype.cpp $$PWD/glsltypes.cpp $$PWD/glslsymbol.cpp $$PWD/glslsymbols.cpp
 
-OTHER_FILES = $$PWD/glsl.g
+DISTFILES = $$PWD/glsl.g
diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro
index 66c0d5f54b..6ac22ab222 100644
--- a/src/libs/qmldebug/qmldebug.pro
+++ b/src/libs/qmldebug/qmldebug.pro
@@ -5,6 +5,6 @@ QTC_LIB_DEPENDS += utils
 include(../../qtcreatorlibrary.pri)
 include(qmldebug-lib.pri)
 
-OTHER_FILES += \
+DISTFILES += \
     qmldebug.pri
 
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
index 53ebfca7fc..d601283a0d 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri
@@ -44,4 +44,4 @@ FORMS += \
 include(easingpane/easingpane.pri)
 
 
-OTHER_FILES += qmleditorwidgets.pri
+DISTFILES += qmleditorwidgets.pri
diff --git a/src/libs/qmljs/parser/parser.pri b/src/libs/qmljs/parser/parser.pri
index 4a9242a845..e17a0955fb 100644
--- a/src/libs/qmljs/parser/parser.pri
+++ b/src/libs/qmljs/parser/parser.pri
@@ -22,5 +22,5 @@ SOURCES += \
     $$PWD/qmldirparser.cpp \
     $$PWD/qmlerror.cpp \
 
-OTHER_FILES += \
+DISTFILES += \
     $$PWD/qmljs.g
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri
index 756bed8ec4..9fa3149640 100644
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -88,7 +88,7 @@ SOURCES += \
 RESOURCES += \
     $$PWD/qmljs.qrc
 
-OTHER_FILES += \
+DISTFILES += \
     $$PWD/parser/qmljs.g
 
 contains(QT, gui) {
diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index ebbb29c8e4..494783d27f 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -99,7 +99,7 @@ equals(TEST, 1) {
         $$PWD/test/completiontesthelper.cpp \
         $$PWD/test/clangcompletion_test.cpp
 
-    OTHER_FILES += \
+    DISTFILES += \
         $$PWD/test/cxx_regression_1.cpp \
         $$PWD/test/cxx_regression_2.cpp \
         $$PWD/test/cxx_regression_3.cpp \
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index ee6cb507b9..40d2bfaaf3 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -242,7 +242,7 @@ else:unix {
         INSTALLS += image$${imagesize}
     }
 }
-OTHER_FILES += editormanager/BinFiles.mimetypes.xml
+DISTFILES += editormanager/BinFiles.mimetypes.xml
 
 equals(TEST, 1) {
     SOURCES += testdatadir.cpp
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 809a6e79f7..c4148d0aa7 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -52,4 +52,4 @@ equals(TEST, 1) {
 
 RESOURCES += designer.qrc
 
-OTHER_FILES += README.txt
+DISTFILES += README.txt
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.pri b/src/plugins/qmldesigner/componentsplugin/componentsplugin.pri
index 727a0d594f..d89d6e96c4 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.pri
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.pri
@@ -35,4 +35,4 @@ FORMS += \
     $$PWD/addtabtotabviewdialog.ui
 
 
-OTHER_FILES += $$PWD/components.metainfo
+DISTFILES += $$PWD/components.metainfo
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
index a52f3fa277..af483051eb 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -11,4 +11,4 @@ HEADERS += $$PWD/qtquickplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 
 RESOURCES += $$PWD/qtquickplugin.qrc
 
-OTHER_FILES += $$PWD/quick.metainfo
+DISTFILES += $$PWD/quick.metainfo
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index 880d1a57db..5eb0b593e1 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -70,7 +70,7 @@ HEADERS += \
 RESOURCES += \
     qml/qmlprofiler.qrc
 
-OTHER_FILES += \
+DISTFILES += \
     qml/ButtonsBar.qml \
     qml/Detail.qml \
     qml/CategoryLabel.qml \
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index 11916659c6..b88d940314 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -81,12 +81,12 @@ defineReplace(stripOutDir) {
 PLUGINJSON = $$_PRO_FILE_PWD_/$${TARGET}.json
 PLUGINJSON_IN = $${PLUGINJSON}.in
 exists($$PLUGINJSON_IN) {
-    OTHER_FILES += $$PLUGINJSON_IN
+    DISTFILES += $$PLUGINJSON_IN
     QMAKE_SUBSTITUTES += $$PLUGINJSON_IN
     PLUGINJSON = $$OUT_PWD/$${TARGET}.json
 } else {
     # need to support that for external plugins
-    OTHER_FILES += $$PLUGINJSON
+    DISTFILES += $$PLUGINJSON
 }
 
 osx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
@@ -104,7 +104,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
 }
 
 MIMETYPES = $$_PRO_FILE_PWD_/$${TARGET}.mimetypes.xml
-exists($$MIMETYPES):OTHER_FILES += $$MIMETYPES
+exists($$MIMETYPES):DISTFILES += $$MIMETYPES
 
 TARGET = $$qtLibraryName($$TARGET)
 
diff --git a/src/tools/3rdparty/iossim/iossim.pro b/src/tools/3rdparty/iossim/iossim.pro
index 47534f00d7..0e3f94122e 100644
--- a/src/tools/3rdparty/iossim/iossim.pro
+++ b/src/tools/3rdparty/iossim/iossim.pro
@@ -52,5 +52,5 @@ HEADERS += \
   version.h \
   dvtiphonesimulatorremoteclient/dvtiphonesimulatorremoteclient.h
 
-OTHER_FILES = IOSSIM_LICENSE \
+DISTFILES = IOSSIM_LICENSE \
   Info.plist
diff --git a/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro b/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro
index fc18227ca2..773776ab7c 100644
--- a/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro
+++ b/src/tools/3rdparty/iossim_1_8_2/iossim_1_8_2.pro
@@ -51,5 +51,5 @@ HEADERS += \
   version.h \
   iphonesimulatorremoteclient/iphonesimulatorremoteclient.h
 
-OTHER_FILES = IOSSIM_LICENSE \
+DISTFILES = IOSSIM_LICENSE \
   Info.plist
diff --git a/src/tools/iostool/iostool.pro b/src/tools/iostool/iostool.pro
index fcabc4abba..f612833598 100644
--- a/src/tools/iostool/iostool.pro
+++ b/src/tools/iostool/iostool.pro
@@ -27,4 +27,4 @@ SOURCES += main.cpp \
 HEADERS += \
     iosdevicemanager.h
 
-OTHER_FILES += Info.plist
+DISTFILES += Info.plist
diff --git a/tests/auto/cplusplus/c99/c99.pro b/tests/auto/cplusplus/c99/c99.pro
index b40c99036d..601c3f82f5 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 891094408a..f1b414bc78 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 17ca6239aa..9d2fed34b8 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 92f0c6c831..6afe681a8b 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 c2c5baf51d..ce8fe64d55 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 2ec06c35db..f828f6571d 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 e777d0aa7f..1b05d06de6 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 a2eba0cada..3ec652ccf9 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 21a3a92db8..e31ae56089 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 df398b1fab..2a24f0d337 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 c52eec0dc4..7f46e9212f 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 0ed02be4d6..1d89df5df6 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 46b0c701ce..ccaa5da46a 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 c80b437af3..d926467456 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 ecd58354f3..71a8760f0d 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 09116f6977..e93564c926 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 5b8c5d1510..e8748cbe67 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 ec8fdc5701..b613c94365 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 7c382caa32..71c8100279 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 e758a2ff34..a08703bbd2 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