summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2012-03-29 12:07:09 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-03 09:02:43 +0200
commit1359220a1fc067725ce0fe904421509247c97fd7 (patch)
treedbdee661209cc4161049a41cdc0a11d68e520db4
parent4321c32604c65c9e80ff6cd0b706afdbdd7ec165 (diff)
Fixed up to run qmlplugindump without gui dependency
The Qt build system compiles modules without X connection up, hence it is not possible to run gui applications as part of the build step. Made qmlplugindump use -platform minimal that should minimize the use of gui resources. Change-Id: I2c7ab98786b8efd0daff202287772c25cff5b281 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
-rw-r--r--src/imports/jsondb-listmodel/jsondb-listmodel.pro1
-rw-r--r--src/imports/jsondb/jsondb.pro1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
index 23061592..b85df152 100644
--- a/src/imports/jsondb-listmodel/jsondb-listmodel.pro
+++ b/src/imports/jsondb-listmodel/jsondb-listmodel.pro
@@ -18,6 +18,7 @@ INSTALLS += target qmldir
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
QMLTYPESFILE = $$QT.jsondb.imports/$$TARGETPATH/plugin.qmltypes
mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump"
+ unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal"
QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondb.libs $$QMLPLUGINDUMP QtAddOn.JsonDb 1.0 $$QT.jsondb.imports > $$QMLTYPESFILE
qmltypes.files = $$QMLTYPESFILE
diff --git a/src/imports/jsondb/jsondb.pro b/src/imports/jsondb/jsondb.pro
index 096d7b80..71d33898 100644
--- a/src/imports/jsondb/jsondb.pro
+++ b/src/imports/jsondb/jsondb.pro
@@ -17,6 +17,7 @@ INSTALLS += target qmldir
!cross_compile {
qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump"
+ unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal"
QMLTYPESFILE = $$QT.jsondbcompat.imports/$$TARGETPATH/plugin.qmltypes
QMAKE_POST_LINK += LD_LIBRARY_PATH=$$QT.jsondbcompat.libs $$QMLPLUGINDUMP QtJsonDb 1.0 $$QT.jsondbcompat.imports > $$QMLTYPESFILE