diff options
| -rw-r--r-- | installerfw.pri | 2 | ||||
| -rw-r--r-- | src/libs/installer/qinstallerglobal.h | 5 | ||||
| -rw-r--r-- | src/sdk/installerbase.cpp | 2 | ||||
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/installerfw.pri b/installerfw.pri index 18224ea49..3799fcdc5 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -92,7 +92,7 @@ isEqual(QT_MAJOR_VERSION, 4) { CONFIG += depend_includepath GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) -DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" +DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1" IFW_VERSION=$$IFW_VERSION static { LIBS += -l7z diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h index 7a043e3eb..b7d5d3f3d 100644 --- a/src/libs/installer/qinstallerglobal.h +++ b/src/libs/installer/qinstallerglobal.h @@ -57,11 +57,6 @@ QT_END_NAMESPACE namespace QInstaller { -#define IFW_VERSION 0x010202 -#define IFW_VERSION_STRING "1.2.2" -#define IFW_VERSION_CHECK(major, minor, patch) \ - ((major << 16)|(minor << 8)|(patch)) - static QRegExp scCommaRegExp(QLatin1String("\\b(,|, )\\b")); enum INSTALLER_EXPORT RunMode diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 79ae8b18b..77b37ea09 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -73,7 +73,7 @@ #define QUOTE_(x) #x #define QUOTE(x) QUOTE_(x) -#define VERSION "IFW Version: \"" IFW_VERSION_STRING "\", Installer base SHA1: \"" QUOTE(_GIT_SHA1_) \ +#define VERSION "IFW Version: \"" QUOTE(IFW_VERSION) "\", Installer base SHA1: \"" QUOTE(_GIT_SHA1_) \ "\", Build date: " QUOTE(__DATE__) "." using namespace QInstaller; diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index f3777b602..33fd8175a 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -173,7 +173,9 @@ Q_UNUSED(settings) plistStream << QLatin1String(" <key>CFBundlePackageType</key>") << endl; plistStream << QLatin1String(" <string>APPL</string>") << endl; plistStream << QLatin1String(" <key>CFBundleGetInfoString</key>") << endl; - plistStream << QLatin1String(" <string>") << QLatin1String(IFW_VERSION_STRING) << ("</string>") << endl; +#define QUOTE_(x) #x +#define QUOTE(x) QUOTE_(x) + plistStream << QLatin1String(" <string>") << QLatin1String(QUOTE(IFW_VERSION)) << ("</string>") << endl; plistStream << QLatin1String(" <key>CFBundleSignature</key>") << endl; plistStream << QLatin1String(" <string> ???? </string>") << endl; plistStream << QLatin1String(" <key>CFBundleExecutable</key>") << endl; |