feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "QtQuick templates: add QML files to OTHER_FILES"

Browse Source 
This reverts commit 67581c5faa.

The patch has multiple issues:

Removing and renaming the .qml file will leave the 'other' 
place unaltered. Also, adding new .qml files won't add them
to both places.

Change-Id: I918aa398f9cd183378982fb15562e8fa66d3ede3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Kai Koehne
2015-04-22 07:33:35 +00:00
parent db344dfbf4
commit c92adf5ab4
9 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/qtquick/qtquick_1_1/app.pro
View File

@@ -7,8 +7,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Installation path # Installation path
# target.path = # target.path =

2
share/qtcreator/templates/qtquick/qtquick_2_1/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
# QML_IMPORT_PATH # # QML_IMPORT_PATH #
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquick_2_2/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
# QML_IMPORT_PATH # # QML_IMPORT_PATH #
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquick_2_3/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
# QML_IMPORT_PATH # # QML_IMPORT_PATH #
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquick_2_4/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
# QML_IMPORT_PATH # # QML_IMPORT_PATH #
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro
View File

@@ -6,8 +6,6 @@ SOURCES += main.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
OTHER_FILES += main.qml MainForm.ui.qml
# Additional import path used to resolve QML modules in Qt Creator's code model # Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = QML_IMPORT_PATH =