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:
committed by
Daniel Teske
parent
7dbb9b2678
commit
ca492c8fac
+1
-1
@@ -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)
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -52,5 +52,5 @@ HEADERS += \
|
||||
version.h \
|
||||
dvtiphonesimulatorremoteclient/dvtiphonesimulatorremoteclient.h
|
||||
|
||||
OTHER_FILES = IOSSIM_LICENSE \
|
||||
DISTFILES = IOSSIM_LICENSE \
|
||||
Info.plist
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user