From a14ab84c44ec4d791533bd0eb0f9c28a1a3cbe56 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Mon, 5 Nov 2012 11:08:56 +0100 Subject: Separate qtquick1 example install paths from qtdeclarative examples 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 Reviewed-by: Jerome Pasion --- examples/demos/samegame/samegame.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/demos/samegame/samegame.pro') diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro index 10b28698..6342ba4a 100644 --- a/examples/demos/samegame/samegame.pro +++ b/examples/demos/samegame/samegame.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/demos/samegame +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() -- cgit v1.2.3