diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2017-07-26 12:44:52 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2017-07-26 13:57:40 +0000 |
| commit | 2b467e8ea7b1250bd80cbc791084bb87b0ef3336 (patch) | |
| tree | 8b7c06d339f19d75bcfd01b58730150723aecd8c /src/app/app.pro | |
| parent | bb145847d7e129c894afa64fa78bcd0a68201ac7 (diff) | |
Fix compilation breakage with mingw / windres
The replacement of string defines in the .rc file that was introduced
in commit b5703bcd029fd does not work with windres. Here the string
literals have to be explicitly quoted by STRINGIFY. Also, we need to
replace literal spaces with \x20.
Task-number: QTCREATORBUG-18635
Change-Id: Ie01886ea680c3c07c4e0a031f12b6fe60e896263
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/app.pro')
| -rw-r--r-- | src/app/app.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index 1414e7d7fc..ed2de94234 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -23,9 +23,11 @@ win32 { # We need the version in two separate formats for the .rc file # RC_VERSION=4,3,82,0 (quadruple) # RC_VERSION_STRING="4.4.0-beta1" (free text) + # Also, we need to replace space with \x20 to be able to work with both rc and windres + COPYRIGHT = "2008-$${QTCREATOR_COPYRIGHT_YEAR} The Qt Company Ltd" DEFINES += RC_VERSION=$$replace(QTCREATOR_VERSION, "\\.", ","),0 \ - RC_VERSION_STRING=\\\"$${QTCREATOR_DISPLAY_VERSION}\\\" \ - RC_COPYRIGHT='"\\\"2008-$${QTCREATOR_COPYRIGHT_YEAR} The Qt Company Ltd\\\""' + RC_VERSION_STRING=\"$${QTCREATOR_DISPLAY_VERSION}\" \ + RC_COPYRIGHT=\"$$replace(COPYRIGHT, " ", "\\x20")\" RC_FILE = qtcreator.rc } else:macx { LIBS += -framework CoreFoundation |