forked from qt-creator/qt-creator
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>
This commit is contained in:
Oswald Buddenhagen
committed by
Daniel Teske
Daniel Teske
parent
7dbb9b2678
commit
ca492c8fac
@@ -13,4 +13,4 @@ QMAKE_CLEAN = qtcreator.sh
|
||||
target.path = $$QTC_PREFIX/bin
|
||||
INSTALLS += target
|
||||
|
||||
OTHER_FILES = $$PWD/qtcreator.sh
|
||||
DISTFILES = $$PWD/qtcreator.sh
|
||||
|
||||
@@ -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) && \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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\"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = qtcreator/static.pro \
|
||||
qtcreator/translations
|
||||
OTHER_FILES += share.qbs \
|
||||
DISTFILES += share.qbs \
|
||||
../src/share/share.qbs
|
||||
|
||||
@@ -35,7 +35,7 @@ win32 {
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
OTHER_FILES += qtcreator.rc \
|
||||
DISTFILES += qtcreator.rc \
|
||||
Info.plist.in \
|
||||
$$PWD/app_version.h.in
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -5,6 +5,6 @@ QTC_LIB_DEPENDS += utils
|
||||
include(../../qtcreatorlibrary.pri)
|
||||
include(qmldebug-lib.pri)
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
qmldebug.pri
|
||||
|
||||
|
||||
@@ -44,4 +44,4 @@ FORMS += \
|
||||
include(easingpane/easingpane.pri)
|
||||
|
||||
|
||||
OTHER_FILES += qmleditorwidgets.pri
|
||||
DISTFILES += qmleditorwidgets.pri
|
||||
|
||||
@@ -22,5 +22,5 @@ SOURCES += \
|
||||
$$PWD/qmldirparser.cpp \
|
||||
$$PWD/qmlerror.cpp \
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
$$PWD/qmljs.g
|
||||
|
||||
@@ -88,7 +88,7 @@ SOURCES += \
|
||||
RESOURCES += \
|
||||
$$PWD/qmljs.qrc
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
$$PWD/parser/qmljs.g
|
||||
|
||||
contains(QT, gui) {
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -52,4 +52,4 @@ equals(TEST, 1) {
|
||||
|
||||
RESOURCES += designer.qrc
|
||||
|
||||
OTHER_FILES += README.txt
|
||||
DISTFILES += README.txt
|
||||
|
||||
@@ -35,4 +35,4 @@ FORMS += \
|
||||
$$PWD/addtabtotabviewdialog.ui
|
||||
|
||||
|
||||
OTHER_FILES += $$PWD/components.metainfo
|
||||
DISTFILES += $$PWD/components.metainfo
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -70,7 +70,7 @@ HEADERS += \
|
||||
RESOURCES += \
|
||||
qml/qmlprofiler.qrc
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
qml/ButtonsBar.qml \
|
||||
qml/Detail.qml \
|
||||
qml/CategoryLabel.qml \
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
2
src/tools/3rdparty/iossim/iossim.pro
vendored
2
src/tools/3rdparty/iossim/iossim.pro
vendored
@@ -52,5 +52,5 @@ HEADERS += \
|
||||
version.h \
|
||||
dvtiphonesimulatorremoteclient/dvtiphonesimulatorremoteclient.h
|
||||
|
||||
OTHER_FILES = IOSSIM_LICENSE \
|
||||
DISTFILES = IOSSIM_LICENSE \
|
||||
Info.plist
|
||||
|
||||
@@ -51,5 +51,5 @@ HEADERS += \
|
||||
version.h \
|
||||
iphonesimulatorremoteclient/iphonesimulatorremoteclient.h
|
||||
|
||||
OTHER_FILES = IOSSIM_LICENSE \
|
||||
DISTFILES = IOSSIM_LICENSE \
|
||||
Info.plist
|
||||
|
||||
@@ -27,4 +27,4 @@ SOURCES += main.cpp \
|
||||
HEADERS += \
|
||||
iosdevicemanager.h
|
||||
|
||||
OTHER_FILES += Info.plist
|
||||
DISTFILES += Info.plist
|
||||
|
||||
@@ -4,5 +4,5 @@ include(../shared/shared.pri)
|
||||
DEFINES += SRCDIR=\\\"$$PWD\\\"
|
||||
|
||||
SOURCES += tst_c99.cpp
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
data/designatedInitializer.1.c
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -4,6 +4,6 @@ include(../qttest.pri)
|
||||
# Input
|
||||
SOURCES += tst_filesearch.cpp
|
||||
|
||||
OTHER_FILES += testfile.txt
|
||||
DISTFILES += testfile.txt
|
||||
|
||||
RESOURCES += tst_filesearch.qrc
|
||||
|
||||
@@ -14,7 +14,7 @@ SOURCES += \
|
||||
TEMPLATE = app
|
||||
DEFINES += QMLJS_BUILD_DIR
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
listAll.data \
|
||||
intersect.data \
|
||||
merge.data \
|
||||
|
||||
@@ -12,7 +12,7 @@ SOURCES += tst_qmllookup.cpp
|
||||
|
||||
RESOURCES += testfiles.qrc
|
||||
|
||||
OTHER_FILES += \
|
||||
DISTFILES += \
|
||||
data/localIdLookup.qml \
|
||||
data/localScriptMethodLookup.qml \
|
||||
data/localScopeLookup.qml \
|
||||
|
||||
@@ -6,7 +6,7 @@ DEFINES += SRCDIR=\\\"$$PWD\\\"
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
OTHER_FILES += qml/main.qml
|
||||
DISTFILES += qml/main.qml
|
||||
|
||||
qml.files = qml
|
||||
qml.path = .
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -45,4 +45,4 @@ HEADERS += main.h\
|
||||
|
||||
FORMS += widget.ui
|
||||
RESOURCES += resource.qrc
|
||||
OTHER_FILES += foo.txt
|
||||
DISTFILES += foo.txt
|
||||
|
||||
@@ -1 +1 @@
|
||||
OTHER_FILES = latin1.txt
|
||||
DISTFILES = latin1.txt
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user