diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-06 21:34:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-07 16:40:07 +0200 |
| commit | 37cc4a649999d20f4eab562d92bd7a704578e650 (patch) | |
| tree | 9577d26034750a3fd3c512cccad1a3120ec67631 /mkspecs/common | |
| parent | 86d1f7a61bb2b3cbaf2de8d030ae74cb2c2a1a13 (diff) | |
centralize+fix addition of copy_dir_files flag
this is in fact a shell-related flag, which determines how QMAKE_DIR_COPY
is assumed to behave.
Change-Id: If774f8a83b40c9ae7107c8e7ef7263af8a2e6c6e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/shell-win32.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/shell-win32.conf b/mkspecs/common/shell-win32.conf index 3b2ace7c90..826e87e34f 100644 --- a/mkspecs/common/shell-win32.conf +++ b/mkspecs/common/shell-win32.conf @@ -9,3 +9,6 @@ QMAKE_CHK_DIR_EXISTS = if not exist QMAKE_CHK_FILE_EXISTS = if not exist QMAKE_CHK_EXISTS_GLUE = QMAKE_MKDIR = mkdir + +# xcopy copies the contained files if source is a directory. Deal with it. +CONFIG += copy_dir_files diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf index e76a67552f..8db20b63cf 100644 --- a/mkspecs/common/wince/qmake.conf +++ b/mkspecs/common/wince/qmake.conf @@ -5,7 +5,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app QT += core gui -CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe +CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32 QT_NO_PRINTER QT_NO_PRINTDIALOG |