diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:40:25 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 14:40:26 +0200 |
| commit | 814f713f01a459b48b12a3695fb1242b7d687662 (patch) | |
| tree | 571598012909d82d15aca670cd9be22823596ad6 /mkspecs/common | |
| parent | 52ebf1f1914cea563b52baffc607407dbc6a7313 (diff) | |
| parent | 448c3e85dddbfc5c101aceeeceb8584a3d41c913 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id96d4076610366a7cc66c8d8382ca25c33eaa71d
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/shell-win32.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/common/shell-win32.conf b/mkspecs/common/shell-win32.conf index a4b813cf7d..131aa746c4 100644 --- a/mkspecs/common/shell-win32.conf +++ b/mkspecs/common/shell-win32.conf @@ -9,6 +9,8 @@ QMAKE_CHK_EXISTS = if not exist %1 QMAKE_CHK_DIR_EXISTS = if not exist # legacy QMAKE_MKDIR = mkdir # legacy QMAKE_MKDIR_CMD = if not exist %1 mkdir %1 & if not exist %1 exit 1 - +# Ugly hack to support cross-building for unix (android). +QMAKE_SYMBOLIC_LINK = $$QMAKE_COPY +QMAKE_LN_SHLIB = $$QMAKE_SYMBOLIC_LINK # xcopy copies the contained files if source is a directory. Deal with it. CONFIG += copy_dir_files |