summaryrefslogtreecommitdiffstats
path: root/examples/declarative/modelviews
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/modelviews
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/modelviews')
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro2
-rw-r--r--examples/declarative/modelviews/gridview/gridview.pro2
-rw-r--r--examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro2
-rw-r--r--examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro2
-rw-r--r--examples/declarative/modelviews/listview/highlight/highlight.pro2
-rw-r--r--examples/declarative/modelviews/listview/highlightranges/highlightranges.pro2
-rw-r--r--examples/declarative/modelviews/listview/sections/sections.pro2
-rw-r--r--examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro2
-rw-r--r--examples/declarative/modelviews/package/package.pro2
-rw-r--r--examples/declarative/modelviews/parallax/parallax.pro2
-rw-r--r--examples/declarative/modelviews/pathview/pathview.pro2
-rw-r--r--examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro2
-rw-r--r--examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro2
13 files changed, 13 insertions, 13 deletions
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 164ed233..7ba55ba6 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -21,7 +21,7 @@ SOURCES = main.cpp model.cpp
HEADERS = model.h
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/abstractitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro
index 967ca931..5ff68def 100644
--- a/examples/declarative/modelviews/gridview/gridview.pro
+++ b/examples/declarative/modelviews/gridview/gridview.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/modelviews/gridview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview-example
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
index 272ff7d3..c37afe45 100644
--- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
+++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.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/modelviews/listview/dynamiclist
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
index 73a32e44..1ddbb46f 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
+++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.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/modelviews/listview/expandingdelegates
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro
index 220dae9e..062de0a7 100644
--- a/examples/declarative/modelviews/listview/highlight/highlight.pro
+++ b/examples/declarative/modelviews/listview/highlight/highlight.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/modelviews/listview/highlight
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
index 0faf1a8f..b27e2c06 100644
--- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
+++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.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/modelviews/listview/highlightranges
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro
index 699a8e4e..edad3e58 100644
--- a/examples/declarative/modelviews/listview/sections/sections.pro
+++ b/examples/declarative/modelviews/listview/sections/sections.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/modelviews/listview/sections
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index 790946cd..d37bd87b 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -22,7 +22,7 @@ SOURCES += main.cpp \
HEADERS += dataobject.h
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/objectlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro
index 6d7a1fab..d68cdcc8 100644
--- a/examples/declarative/modelviews/package/package.pro
+++ b/examples/declarative/modelviews/package/package.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/modelviews/package
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro
index 51307e54..cf21b699 100644
--- a/examples/declarative/modelviews/parallax/parallax.pro
+++ b/examples/declarative/modelviews/parallax/parallax.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/modelviews/parallax
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro
index 9bd27e18..9b00ce2c 100644
--- a/examples/declarative/modelviews/pathview/pathview.pro
+++ b/examples/declarative/modelviews/pathview/pathview.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/modelviews/pathview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview-example
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
index e7221f02..8d326922 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -20,7 +20,7 @@ QT += widgets
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/modelviews/stringlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
index 19ea9469..7309eea1 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.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/modelviews/visualitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()