diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-07-03 21:59:27 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-05 11:55:07 +0200 |
| commit | ff11bc5e3371ec3dfd911e40054bc6037d683190 (patch) | |
| tree | 1d45102920fc5a09b161eabb81194974b36e8d63 | |
| parent | 6abbd283447edd4100c0fc24abab206ff9957410 (diff) | |
Prevent compilation failure when cross compiling
qmlplugindump is built for the target, and hence should not be executed on
the host. To further complicate matters, it has a hard dependency on
Qt Declarative internals and hence can't be adjusted to being a host tool
since it would effectively require a complete Qt build on the host machine.
Change-Id: I979fdd65039664d267f92b79a6791c220fb73b90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| -rw-r--r-- | src/imports/jsondb-listmodel/jsondb-listmodel.pro | 2 | ||||
| -rw-r--r-- | src/imports/jsondb/jsondb.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/jsondb-listmodel/jsondb-listmodel.pro b/src/imports/jsondb-listmodel/jsondb-listmodel.pro index 3ac956f0..181ab641 100644 --- a/src/imports/jsondb-listmodel/jsondb-listmodel.pro +++ b/src/imports/jsondb-listmodel/jsondb-listmodel.pro @@ -14,7 +14,7 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir #rules for qmltypes -contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) { +!cross_compile:contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) { qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) QMLTYPESFILE = $$QT.jsondb.imports/$$TARGETPATH/plugin.qmltypes mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump" diff --git a/src/imports/jsondb/jsondb.pro b/src/imports/jsondb/jsondb.pro index e1753bbf..e553049b 100644 --- a/src/imports/jsondb/jsondb.pro +++ b/src/imports/jsondb/jsondb.pro @@ -14,7 +14,7 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir #rules for qmltypes -contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) { +!cross_compile:contains(QMAKE_HOST.arch, x86) | contains(QMAKE_HOST.arch, x86_64) { qtPrepareTool(QMLPLUGINDUMP, qmlplugindump) mac: !exists($$QMLPLUGINDUMP): QMLPLUGINDUMP = "$${QMLPLUGINDUMP}.app/Contents/MacOS/qmlplugindump" unix:!mac: QMLPLUGINDUMP = "$${QMLPLUGINDUMP} -platform minimal" |