diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-12 09:13:44 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-12 17:45:30 (GMT) |
| commit | 95c55b8a913fd7aaa23a44f1f9aa568342b25e07 (patch) | |
| tree | a3a34acd5291a19b3b8c7fedf5049c5cab53525d | |
| parent | 57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8 (diff) | |
| download | Qt-95c55b8a913fd7aaa23a44f1f9aa568342b25e07.zip Qt-95c55b8a913fd7aaa23a44f1f9aa568342b25e07.tar.gz Qt-95c55b8a913fd7aaa23a44f1f9aa568342b25e07.tar.bz2 | |
When x-compiling on Linux the host tools doesn't have Windows' executable suffix
patch not needed for Qt5
Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 6d631fc..2cd2214 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -11,6 +11,8 @@ MAKEFILE_GENERATOR = MINGW load(device_config) +equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe + TEMPLATE = app CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header QT += core gui @@ -101,9 +103,9 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain QMAKE_CHK_DIR_EXISTS = if not exist } -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe +QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc$${EXE_SUFFIX} +QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic$${EXE_SUFFIX} +QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc$${EXE_SUFFIX} QMAKE_IDL = midl QMAKE_LIB = $${CROSS_COMPILE}ar -ru |