diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-13 09:40:26 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 17:02:05 +0100 |
| commit | 4cccbe3e5a72bc38e0dc0066d12237ee1dc92db2 (patch) | |
| tree | b8da484cbe492634caf29fed96d5a070043878b5 /pkg.pri | |
| parent | 526d51a3b1e0dd7109ec01df5dcbdfd3782cea80 (diff) | |
Fix creation for target directories under Windows.
Use backslash and check existence of target directory in
pkg.pri.
Change-Id: I08d4b571b3f17a59a3fb29355f464e2fa1f615c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'pkg.pri')
| -rw-r--r-- | pkg.pri | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -30,10 +30,12 @@ mt { target_dir = $$DESTDIR/$${TARGET}.app/Contents/Resources/qml } else { target_dir = $$DESTDIR/resources/$$CATEGORY/$${TARGET}/qml + target_dir ~= s,/,$$QMAKE_DIR_SEP, } copyqmlinfra.input = QML_INFRA_FILES copyqmlinfra.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlinfra.commands = $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + win32: copyqmlinfra.commands = $$QMAKE_CHK_DIR_EXISTS $$target_dir + copyqmlinfra.commands += $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copyqmlinfra.CONFIG += no_link_no_clean copyqmlinfra.variable_out = POST_TARGETDEPS QMAKE_EXTRA_COMPILERS += copyqmlinfra @@ -59,10 +61,12 @@ mt { target_dir = $$DESTDIR/$${TARGET}.app/Contents/Resources/qml/meshes } else { target_dir = $$DESTDIR/resources/$$CATEGORY/$${TARGET}/qml/meshes + target_dir ~= s,/,$$QMAKE_DIR_SEP, } copyqmlmeshes.input = QML_MESHES_FILES copyqmlmeshes.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlmeshes.commands = $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + win32: copyqmlmeshes.commands = $$QMAKE_CHK_DIR_EXISTS $$target_dir + copyqmlmeshes.commands += $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copyqmlmeshes.CONFIG += no_link_no_cle:qan copyqmlmeshes.variable_out = POST_TARGETDEPS QMAKE_EXTRA_COMPILERS += copyqmlmeshes |