From 67581c5faa0f219bb16110e0f764e3dda73b4d72 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 20 Apr 2015 15:24:16 +0200 Subject: [PATCH] QtQuick templates: add QML files to OTHER_FILES It's nice that main.qml shows up in the project tree under "QML" Change-Id: I4e8be4cc962f2d1c204e7435e0a67a88ea76db5e Reviewed-by: Nikita Baryshnikov Reviewed-by: Thomas Hartmann --- 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 insertions(+) diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro b/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro index 4c3dc5c8cbf..09cb1138720 100644 --- a/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro @@ -7,6 +7,8 @@ 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 fa61ce669e3..853e385a6a6 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_1/app.pro @@ -6,6 +6,8 @@ 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 fa61ce669e3..853e385a6a6 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_2/app.pro @@ -6,6 +6,8 @@ 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 fa61ce669e3..853e385a6a6 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_3/app.pro @@ -6,6 +6,8 @@ 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 fa61ce669e3..853e385a6a6 100644 --- a/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro +++ b/share/qtcreator/templates/qtquick/qtquick_2_4/app.pro @@ -6,6 +6,8 @@ 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 1c260786ad7..f12d122fb03 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro @@ -6,6 +6,8 @@ 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 1c260786ad7..f12d122fb03 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro @@ -6,6 +6,8 @@ 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 1c260786ad7..f12d122fb03 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro @@ -6,6 +6,8 @@ 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 1c260786ad7..103504c15c2 100644 --- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro +++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro @@ -6,6 +6,8 @@ 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 =