summaryrefslogtreecommitdiffstats
path: root/examples/declarative/ui-components
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2012-11-05 11:08:56 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-05 14:40:07 +0100
commita14ab84c44ec4d791533bd0eb0f9c28a1a3cbe56 (patch)
tree7417e67fe5d5b03d5e29e60b9747293c54cb2396 /examples/declarative/ui-components
parent0f3a10e37839afab8ae759e74369b992df8bc318 (diff)
Separate qtquick1 example install paths from qtdeclarative examplesv5.0.0-beta2
After QtQuick1 -> QtDeclarative name change (79fed875), the examples both in qtquick1 and qtdeclarative use the same install path, causing conflicts. This change restores the install path used by qtquick1 examples as its own subdirectory under QT_INSTALL_EXAMPLES. Task-number: QTBUG-27823 Change-Id: Ica9ab8c5984642ace934e694cba346bcd3a1cb4c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/declarative/ui-components')
-rw-r--r--examples/declarative/ui-components/dialcontrol/dialcontrol.pro2
-rw-r--r--examples/declarative/ui-components/flipable/flipable.pro2
-rw-r--r--examples/declarative/ui-components/main/main.pro2
-rw-r--r--examples/declarative/ui-components/progressbar/progressbar.pro2
-rw-r--r--examples/declarative/ui-components/scrollbar/scrollbar.pro2
-rw-r--r--examples/declarative/ui-components/searchbox/searchbox.pro2
-rw-r--r--examples/declarative/ui-components/slideswitch/slideswitch.pro2
-rw-r--r--examples/declarative/ui-components/spinner/spinner.pro2
-rw-r--r--examples/declarative/ui-components/tabwidget/tabwidget.pro2
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
index 741c0429..5e112a8d 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/dialcontrol
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro
index 9707142b..0cfd2ec2 100644
--- a/examples/declarative/ui-components/flipable/flipable.pro
+++ b/examples/declarative/ui-components/flipable/flipable.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/flipable
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro
index c0e53864..428ffd47 100644
--- a/examples/declarative/ui-components/main/main.pro
+++ b/examples/declarative/ui-components/main/main.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/main
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro
index 5557daba..8e232277 100644
--- a/examples/declarative/ui-components/progressbar/progressbar.pro
+++ b/examples/declarative/ui-components/progressbar/progressbar.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/progressbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro
index c29a02dc..5843ef7f 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.pro
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/scrollbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro
index 56c060b8..6219524f 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.pro
+++ b/examples/declarative/ui-components/searchbox/searchbox.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/searchbox
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro
index 77b3d996..63e471cf 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.pro
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/slideswitch
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro
index 20a686da..0c65f28d 100644
--- a/examples/declarative/ui-components/spinner/spinner.pro
+++ b/examples/declarative/ui-components/spinner/spinner.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/spinner
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro
index caa03212..97d49ea2 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.pro
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro
@@ -18,7 +18,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/ui-components/tabwidget
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()