summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/common')
-rw-r--r--mkspecs/common/shell-win32.conf3
-rw-r--r--mkspecs/common/wince/qmake.conf2
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