1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove redundant OTHER_FILES assignments

Browse Source 
newer versions of qt creator understand QMAKE_EXTRA_COMPILERS and
INSTALLS, so there is no need to list the files twice.

Change-Id: Iccf3cc3248daf3422b8c366c2eb2d2f46c5f08d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2016-04-22 20:20:47 +02:00
parent 9af2cccc59
commit be6a92ec09
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mkspecs/features/qml_module.prf
View File

@ -17,9 +17,6 @@ fq_qml_files = $$_PRO_FILE_PWD_/qmldir
for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_) for(qmlf, QML_FILES): fq_qml_files += $$absolute_path($$qmlf, $$_PRO_FILE_PWD_)
# Only for Qt Creator's project view
OTHER_FILES += $$fq_qml_files
qml1_target: \ qml1_target: \
instbase = $$[QT_INSTALL_IMPORTS] instbase = $$[QT_INSTALL_IMPORTS]
else: \ else: \

2
src/plugins/bearer/android/jar/jar.pri
View File

@ -9,5 +9,3 @@ JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
# install # install
target.path = $$[QT_INSTALL_PREFIX]/jar target.path = $$[QT_INSTALL_PREFIX]/jar
INSTALLS += target INSTALLS += target
OTHER_FILES += $$JAVASOURCES

1
tests/auto/corelib/io/qloggingregistry/qloggingregistry.pro
View File

@ -5,7 +5,6 @@ CONFIG += testcase
QT = core core-private testlib QT = core core-private testlib
SOURCES += tst_qloggingregistry.cpp SOURCES += tst_qloggingregistry.cpp
OTHER_FILES += qtlogging.ini
TESTDATA += qtlogging.ini TESTDATA += qtlogging.ini
android:!android-no-sdk: { android:!android-no-sdk: {

1
tests/manual/textrendering/glyphshaping/glyphshaping.pro
View File

@ -1,6 +1,5 @@
QT += widgets QT += widgets
SOURCES = main.cpp SOURCES = main.cpp
OTHER_FILES = glyphshaping_data.xml
glyphshaping_data.path = . glyphshaping_data.path = .
glyphshaping_data.files = $$PWD/glyphshaping_data.xml glyphshaping_data.files = $$PWD/glyphshaping_data.xml
DEPLOYMENT += glyphshaping_data DEPLOYMENT += glyphshaping_data