summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-20 15:24:16 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-04-22 07:15:41 +0000
commit67581c5faa0f219bb16110e0f764e3dda73b4d72 (patch)
treed838cd356ae2d897e366a8611afeac23a0c0e960
parent802a305737b45896acd123ff2dfbb1a5cc28ddfe (diff)
downloadqt-creator-67581c5faa0f219bb16110e0f764e3dda73b4d72.tar.gz
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 <nib952051@gmail.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--share/qtcreator/templates/qtquick/qtquick_1_1/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquick_2_1/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquick_2_2/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquick_2_3/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquick_2_4/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquickcontrols_1_0/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquickcontrols_1_1/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquickcontrols_1_2/app.pro2
-rw-r--r--share/qtcreator/templates/qtquick/qtquickcontrols_1_3/app.pro2
9 files changed, 18 insertions, 0 deletions
diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro b/share/qtcreator/templates/qtquick/qtquick_1_1/app.pro
index 4c3dc5c8cb..09cb113872 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 fa61ce669e..853e385a6a 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 fa61ce669e..853e385a6a 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 fa61ce669e..853e385a6a 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 fa61ce669e..853e385a6a 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 1c260786ad..f12d122fb0 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 1c260786ad..f12d122fb0 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 1c260786ad..f12d122fb0 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 1c260786ad..103504c15c 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 =