From c92adf5ab472a8d886034bbfe67aebb22d932270 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 22 Apr 2015 07:33:35 +0000 Subject: [PATCH] Revert "QtQuick templates: add QML files to OTHER_FILES" This reverts commit 67581c5faa0f219bb16110e0f764e3dda73b4d72. 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 Reviewed-by: J-P Nurmi Reviewed-by: Daniel Teske --- share/qtcreator/templates/qtquick/qtquick_1_1/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquick_2_1/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquick_2_2/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquick_2_3/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquick_2_4/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro | 2 -- share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro | 2 -- 9 files changed, 18 deletions(-) diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro b/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro index 09cb1138720..4c3dc5c8cbf 100644 --- a/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro @@ -7,8 +7,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Installation path # target.path = diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro b/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro index 853e385a6a6..fa61ce669e3 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model # QML_IMPORT_PATH # QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro b/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro index 853e385a6a6..fa61ce669e3 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model # QML_IMPORT_PATH # QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro b/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro index 853e385a6a6..fa61ce669e3 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model # QML_IMPORT_PATH # QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro b/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro index 853e385a6a6..fa61ce669e3 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model # QML_IMPORT_PATH # QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro index f12d122fb03..1c260786ad7 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro index f12d122fb03..1c260786ad7 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro index f12d122fb03..1c260786ad7 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml - # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro b/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro index 103504c15c2..1c260786ad7 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp RESOURCES += qml.qrc -OTHER_FILES += main.qml MainForm.ui.qml - # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH =