diff options
| author | Dominik Riebeling <bluebrother@gmx.de> | 2010-04-08 16:01:18 +0200 |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-04-08 16:01:18 +0200 |
| commit | 4a557f79976d7b6cbb1fa35d728cba784dc32a09 (patch) | |
| tree | 181717402343015f10369c7676660f770f4b9906 /mkspecs | |
| parent | 0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8 (diff) | |
| download | qt4-tools-4a557f79976d7b6cbb1fa35d728cba784dc32a09.tar.gz | |
Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.
When using the configuration option "-config silent" building on MinGW fails
due to the use of the backslash as path delimiter. Using DIR_SEPARATOR instead
of the hardcoded delimiter (like done for MOC) fixes this.
Reviewed-by: aavit
Merge-request: 1697
Reviewed-by: aavit <qt-info@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/resources.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 8ccd576d0d..eb33aabe60 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -1,6 +1,6 @@ isEmpty(QMAKE_RCC) { - win32:QMAKE_RCC = $$[QT_INSTALL_BINS]\rcc.exe - else:QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc + win32:QMAKE_RCC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}rcc.exe + else:QMAKE_RCC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}rcc } isEmpty(RCC_DIR):RCC_DIR = . diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index eaf373a520..8ebe0ea19a 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -1,11 +1,11 @@ isEmpty(QMAKE_UIC3) { - contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe + contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic3.exe else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3 } isEmpty(QMAKE_UIC) { - contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe + contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic } |