diff options
| author | Tim Jenssen <tim.jenssen@nokia.com> | 2012-05-16 12:11:25 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-05-16 13:21:08 +0200 |
| commit | dfc9887310118de98146f1a7282198f89fae8c18 (patch) | |
| tree | 3fe785db1287863e041e35ffa6258cbd3e191124 /src/libs/installer/qtcreator_constants.h | |
| parent | 089fb8b740d0d56522e5def0af93a10eaa6abddc (diff) | |
now the qt creator releated locations are more flexible
- tried to remove or move Qt/Qt Creator related things from the core classes
Change-Id: I168ae3c56785e389ac34b761be98a7782a683de7
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'src/libs/installer/qtcreator_constants.h')
| -rw-r--r-- | src/libs/installer/qtcreator_constants.h | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/libs/installer/qtcreator_constants.h b/src/libs/installer/qtcreator_constants.h index d8c29a302..546923c82 100644 --- a/src/libs/installer/qtcreator_constants.h +++ b/src/libs/installer/qtcreator_constants.h @@ -33,30 +33,6 @@ #ifndef QTCREATOR_CONSTANTS_H #define QTCREATOR_CONSTANTS_H -#if defined(Q_OS_MAC) - static const char QtCreatorSettingsSuffixPath[] = - "/Qt Creator.app/Contents/Resources/Nokia/QtCreator.ini"; -#else - static const char QtCreatorSettingsSuffixPath[] = - "/QtCreator/share/qtcreator/Nokia/QtCreator.ini"; -#endif - -#if defined(Q_OS_MAC) - static const char ToolChainSettingsSuffixPath[] = - "/Qt Creator.app/Contents/Resources/Nokia/toolChains.xml"; -#else - static const char ToolChainSettingsSuffixPath[] = - "/QtCreator/share/qtcreator/Nokia/toolChains.xml"; -#endif - -#if defined(Q_OS_MAC) - static const char QtVersionSettingsSuffixPath[] = - "/Qt Creator.app/Contents/Resources/Nokia/qtversion.xml"; -#else - static const char QtVersionSettingsSuffixPath[] = - "/QtCreator/share/qtcreator/Nokia/qtversion.xml"; -#endif - // Begin - copied from Creator src\plugins\projectexplorer\toolchainmanager.cpp static const char TOOLCHAIN_DATA_KEY[] = "ToolChain."; static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count"; @@ -74,4 +50,11 @@ static const char QtVersionsSectionName[] = "QtVersions"; static const char newQtVersionsKey[] = "NewQtVersions"; // End - copied from Creator +//the values for these keys are built in packagemanagercore->value() on the fly +//so it is possible that the installer creator can choose the location for these settings files +static const QLatin1String scQtCreatorInstallerSettingsFile("QtCreatorInstallerSettingsFile"); +static const QLatin1String scQtCreatorInstallerToolchainsFile("QtCreatorInstallerToolchainsFile"); +static const QLatin1String scQtCreatorInstallerQtVersionFile("QtCreatorInstallerQtVersionFile"); + + #endif // QTCREATOR_CONSTANTS_H |