diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-28 15:24:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-28 15:24:14 +0200 |
| commit | c01ddc4660c10e8ddc605602fd623135fb607de0 (patch) | |
| tree | fdf50dee801ce09d2a6d671d558b73d8769870d9 /src/app/app.pro | |
| parent | 712297cbf0b73d8af8db3921c646ed252b0c41d7 (diff) | |
| parent | 36968528805d99a746d27f2632cabc1a132e535f (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qbsprojectmanager/qbsproject.h
Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8
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 4d6030bfe7..a2313575fe 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -20,9 +20,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 |