summaryrefslogtreecommitdiffstats
path: root/pkg.pri
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-10-17 13:28:09 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-18 02:16:21 +0200
commit3d81f11a10fbd9f260321d09e00db60c22e96ccc (patch)
treedb00f323d97178d8adf145264a6ead12dbac6bd3 /pkg.pri
parentd574a5967645f8ad4cc818ec74ede84fbe9bfe6c (diff)
Remove legacy build system logic.
In Qt4, qtquick3d had to reinvent a lot of Qt's own build system logic. In Qt5, modularization makes this unnecessary, so remove it. Change-Id: I683acba659c1a3842e927262cacd9377cdac7c35 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'pkg.pri')
-rw-r--r--pkg.pri6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg.pri b/pkg.pri
index 540da7e0e..78e39f6e6 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -117,7 +117,7 @@ qt3d_deploy_qml {
TARGET_DIR = /opt/mt/applications/$$TARGET
}
} else {
- TARGET_DIR = $$QT3D_INSTALL_DATA/quick3d/resources/examples/$$TARGET
+ TARGET_DIR = $$[QT_INSTALL_DATA]/quick3d/resources/examples/$$TARGET
}
symbian {
TARGET_DIR = .
@@ -253,12 +253,12 @@ defineTest(qtcAddDeployment) {
itemfiles = $${item}.files
$$itemfiles = $$eval($${deploymentfolder}.source)
itempath = $${item}.path
- $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+ $$itempath = $$[QT_INSTALL_PREFIX]/$$eval($${deploymentfolder}.target)
export($$itemfiles)
export($$itempath)
INSTALLS += $$item
}
- target.path = $${installPrefix}/bin
+ target.path = $$[QT_INSTALL_BINS]
}
export(icon.files)
export(icon.path)