[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [necessitas-installer-framework/unstable] installerbuilder/libinstaller: Revert "Adapt the installer
From:       BogDan Vatra <bog_dan_ro () yahoo ! com>
Date:       2012-07-15 13:42:20
Message-ID: 20120715134220.40A75A6094 () git ! kde ! org
[Download RAW message or body]

Git commit e736be06eda3b57703f21bd2d048fd572a998280 by BogDan Vatra.
Committed on 15/07/2012 at 15:42.
Pushed by vatra into branch 'unstable'.

Revert "Adapt the installer to new configurations schema"

This reverts commit 47c1a5446c417984bcfd880bf900911baa74f693.

M  +4    -4    installerbuilder/libinstaller/packagemanagercore_p.cpp
M  +6    -6    installerbuilder/libinstaller/qtcreator_constants.h

http://commits.kde.org/necessitas-installer-framework/e736be06eda3b57703f21bd2d048fd572a998280


diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp \
b/installerbuilder/libinstaller/packagemanagercore_p.cpp index c9cf25f..7686681 \
                100644
--- a/installerbuilder/libinstaller/packagemanagercore_p.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp
@@ -564,13 +564,13 @@ void PackageManagerCorePrivate::initialize()
     if (info.exists()) {
         m_vars.insert(QLatin1String("QtCreatorSettingsFile"), \
info.absoluteFilePath());  QDir settingsDirectory = info.absoluteDir();
-        if (settingsDirectory.exists(QLatin1String("qtcreator/qtversion.xml"))) {
+        if (settingsDirectory.exists(QLatin1String("qtversion.xml"))) {
                 m_vars.insert(QLatin1String("QtCreatorSettingsQtVersionFile"),
-                              \
settingsDirectory.absoluteFilePath(QLatin1String("qtcreator/qtversion.xml"))); +      \
settingsDirectory.absoluteFilePath(QLatin1String("qtversion.xml")));  }
-        if (settingsDirectory.exists(QLatin1String("qtcreator/toolchains.xml"))) {
+        if (settingsDirectory.exists(QLatin1String("toolChains.xml"))) {
                 m_vars.insert(QLatin1String("QtCreatorSettingsToolchainsFile"),
-                              \
settingsDirectory.absoluteFilePath(QLatin1String("qtcreator/toolchains.xml"))); +     \
settingsDirectory.absoluteFilePath(QLatin1String("toolChains.xml")));  }
     }
 
diff --git a/installerbuilder/libinstaller/qtcreator_constants.h \
b/installerbuilder/libinstaller/qtcreator_constants.h index 94cbb54..37d41b7 100644
--- a/installerbuilder/libinstaller/qtcreator_constants.h
+++ b/installerbuilder/libinstaller/qtcreator_constants.h
@@ -11,26 +11,26 @@
 
 #if defined(Q_OS_MAC)
     static const char ToolChainSettingsSuffixPath[] =
-        "/Qt Creator.app/Contents/Resources/Nokia/qtcreator/toolchains.xml";
+        "/Qt Creator.app/Contents/Resources/Nokia/toolChains.xml";
 #else
     static const char ToolChainSettingsSuffixPath[] =
-        "/QtCreator/share/qtcreator/Nokia/qtcreator/toolchains.xml";
+        "/QtCreator/share/qtcreator/Nokia/toolChains.xml";
 #endif
 
 #if defined(Q_OS_MAC)
     static const char QtVersionSettingsSuffixPath[] =
-        "/Qt Creator.app/Contents/Resources/Nokia/qtcreator/qtversion.xml";
+        "/Qt Creator.app/Contents/Resources/Nokia/qtversion.xml";
 #else
     static const char QtVersionSettingsSuffixPath[] =
-        "/QtCreator/share/qtcreator/Nokia/qtcreator/qtversion.xml";
+        "/QtCreator/share/qtcreator/Nokia/qtversion.xml";
 #endif
 
 #if defined ( Q_OS_MAC )
     static const char *const GenericQtSettingsSuffixPath =
-        "/Qt Creator.app/Contents/Resources/Nokia/qtcreator/";
+        "/Qt Creator.app/Contents/Resources/Nokia/";
 #else
     static const char *const GenericQtSettingsSuffixPath =
-        "/QtCreator/share/qtcreator/Nokia/qtcreator/";
+        "/QtCreator/share/qtcreator/Nokia/";
 #endif
 
 // Begin - copied from Creator src\plugins\projectexplorer\toolchainmanager.cpp


[prev in list] [next in list] [prev in thread] [next in thread]