diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-08 14:35:41 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-08 18:24:33 +0200 |
| commit | f0629b6b77227557ffc943f46e76f6ec0d4f0ad5 (patch) | |
| tree | a5309eaf67250be61be77856bdae5f84cb10ca1d /src/app/app_version.h.in | |
| parent | da2ae22036c2399f734dbd3867bad056fbb32738 (diff) | |
| download | qt-creator-f0629b6b77227557ffc943f46e76f6ec0d4f0ad5.tar.gz | |
Move settings from Nokia to QtProject
Store settings in QtProject, not Nokia. Move them over to the new
place if any settings in Nokia exist.
Task-number: QTCREATOR-7976
Change-Id: I5af77923aa51016add9079b21e78d94d46f20010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/app/app_version.h.in')
| -rw-r--r-- | src/app/app_version.h.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index 09d26adedc..c04aed72dc 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -63,9 +63,16 @@ const char * const IDE_REVISION_STR = \"\"; #ifdef IDE_SETTINGSVARIANT const char * const IDE_SETTINGSVARIANT_STR = STRINGIFY(IDE_SETTINGSVARIANT); #else -const char * const IDE_SETTINGSVARIANT_STR = \"Nokia\"; +const char * const IDE_SETTINGSVARIANT_STR = \"QtProject\"; #endif +#ifdef IDE_COPY_SETTINGS_FROM_VARIANT +const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = STRINGIFY(IDE_COPY_SETTINGS_FROM_VARIANT); +#else +const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = \"Nokia\"; +#endif + + #undef IDE_VERSION #undef IDE_VERSION_STR #undef STRINGIFY |