diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/shell-win32.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/unsupported/win32-msvc2003/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-icc/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc11/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2005/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2008/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/win32-msvc2010/qmake.conf | 2 |
10 files changed, 12 insertions, 9 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 diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 0b7776222c..a1283b669e 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MINGW TEMPLATE = app -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header +CONFIG += qt warn_on release link_prl debug_and_release debug_and_release_target precompile_header QT += core gui DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf index 7008cb018e..59ae7d5a93 100644 --- a/mkspecs/unsupported/win32-msvc2003/qmake.conf +++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app -CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source copy_dir_files debug_and_release debug_and_release_target +CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target QT += core gui DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 398dba7b09..5e599d19c1 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MINGW TEMPLATE = app -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header +CONFIG += qt warn_on release link_prl debug_and_release debug_and_release_target precompile_header QT += core gui DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 3e275facd7..3a741f238f 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app -CONFIG += qt warn_on release incremental flat link_prl copy_dir_files debug_and_release debug_and_release_target +CONFIG += qt warn_on release incremental flat link_prl debug_and_release debug_and_release_target QT += core gui DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32 diff --git a/mkspecs/win32-msvc11/qmake.conf b/mkspecs/win32-msvc11/qmake.conf index 230ea8fb00..ef1842555e 100644 --- a/mkspecs/win32-msvc11/qmake.conf +++ b/mkspecs/win32-msvc11/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSBUILD TEMPLATE = app -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 QT += core gui DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32 diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index bfc481d539..0fadaf85a3 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app -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 QT += core gui DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32 diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf index 46cccff288..677659cfde 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSVC.NET TEMPLATE = app -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 QT += core gui DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32 diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf index 2327ed87ec..9f26ab601e 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSBUILD TEMPLATE = app -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 QT += core gui DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1600 WIN32 |