Skip to content

Commit

Permalink
Android on Windows: Add 2 missing qmake variables.
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
  • Loading branch information
mingwandroid authored and The Qt Project committed Apr 2, 2013
1 parent 731f2a1 commit ff58c27
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion mkspecs/common/shell-win32.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ff58c27

Please sign in to comment.