diff options
| author | Ray Donnelly <mingw.android@gmail.com> | 2013-03-20 21:56:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 00:37:48 +0200 |
| commit | ff58c27347603de1eff5651bdfa3a8f51c85291d (patch) | |
| tree | 7a184c575f1f52cb9952b2da7feb66deb92b3cd5 /mkspecs/common | |
| parent | 731f2a179b2056509582ac66641cdd3c846ac9dc (diff) | |
Android on Windows: Add 2 missing qmake variables.
In order to build Android Qt on Windows via
cmd.exe using the unix makefile generator,
mkspecs/common/shell-win32.conf needs
QMAKE_SYMBOLIC_LINK and QMAKE_LN_SHLIB
Change-Id: I1b3eded66cec06ab131f127c1d46b99124613561
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
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 |