summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-16 12:39:10 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-01 12:47:26 +0000
commit0b7dd07c7a4d165d2235802176d65dab7578c669 (patch)
treecc341d6c41066401f6c73f5e612c7a1ee105d8f2
parent531bd41d00509840cf5dfc767995549c27211341 (diff)
downloadbrowser-poc-baserock/jonathanmaw/sensible-build.tar.gz
Add install instructionsbaserock/jonathanmaw/sensible-build
These instructions install the browser PoC to /usr/lib/browser-poc by default, instead of /opt. "/usr/lib/browser-poc" can be replaced by anything else at configure-time (i.e. when `qmake browser-poc.pro`) is invoked by setting the environment variable TARGET_ROOT. Note that this is entirely separate from the use of INSTALL_ROOT at install-time (i.e. `make install`). i.e. you may want to do TARGET_ROOT=/opt qmake -r browser-poc.pro make make INSTALL_ROOT=$(pwd)/browser-poc-package install This involves overriding qtquick2applicationviewer.pri's setting installation paths to /opt because it seems inappropriate to alter it directly and I am not entirely sure what else it does.
-rw-r--r--browser/browser.pro11
-rw-r--r--demoui/demoui.pro17
-rw-r--r--testapp/testapp.pro12
3 files changed, 40 insertions, 0 deletions
diff --git a/browser/browser.pro b/browser/browser.pro
index 0451cf3..61d58ed 100644
--- a/browser/browser.pro
+++ b/browser/browser.pro
@@ -67,6 +67,17 @@ HEADERS += \
../common/bookmark.h \
../common/browserdefs.h \
+_T = $$(TARGET_ROOT)
+!isEmpty(_T) {
+ target_root = $$(TARGET_ROOT)
+} else {
+ target_root = /usr/lib/browser-poc
+}
+
+browser.files = browser
+browser.path = $$target_root/browser
+INSTALLS += browser
+
# Generation of the adaptor doesn't trigger properly, so this is a temp fix
system("$$[QT_INSTALL_PREFIX]/bin/qdbusxml2cpp -i cachemanager.h\
-i ../common/browserdefs.h\
diff --git a/demoui/demoui.pro b/demoui/demoui.pro
index d9640ca..5e5da69 100644
--- a/demoui/demoui.pro
+++ b/demoui/demoui.pro
@@ -20,7 +20,24 @@ include(../common/common.pri)
SOURCES += main.cpp \
+_T = $$(TARGET_ROOT)
+!isEmpty(_T) {
+ target_root = $$(TARGET_ROOT)
+} else {
+ target_root = /usr/lib/browser-poc
+}
+
+demoui.files = demoui \
+ qml \
+ images
+demoui.path = $$target_root/demoui
+
+INSTALLS += demoui
+
# Please do not modify the following two lines. Required for deployment.
include(qtquick2applicationviewer/qtquick2applicationviewer.pri)
qtcAddDeployment()
+# Clumsily overriding qtquick2applicationview.pri's installation to /opt
+itemfolder_01.path = $$demoui.path
+target.path = $$demoui.path
diff --git a/testapp/testapp.pro b/testapp/testapp.pro
index 9557d16..afca957 100644
--- a/testapp/testapp.pro
+++ b/testapp/testapp.pro
@@ -47,3 +47,15 @@ OTHER_FILES += \
qml/testapp/CacheManager.qml \
qml/testapp/ErrorLogger.qml
+_T = $$(TARGET_ROOT)
+!isEmpty(_T) {
+ target_root = $$(TARGET_ROOT)
+} else {
+ target_root = /usr/lib/browser-poc
+}
+
+testapp.files = testapp \
+ qml \
+ images
+testapp.path = $$target_root/testapp
+INSTALLS += testapp