Commit bbfc49fe authored by tjenssen's avatar tjenssen Committed by Eike Ziller

Prepare Qt Creator to have a flexible settings-path.

Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: default avatarTim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: default avatarBogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent e271000b
......@@ -82,13 +82,12 @@ namespace {
const QLatin1String Unknown("unknown");
const QLatin1String keytoolName("keytool");
const QLatin1String jarsignerName("jarsigner");
const QLatin1String androidFilename("/android.xml");
const QLatin1String changeTimeStamp("ChangeTimeStamp");
static QString settingsFileName()
{
return Core::ICore::instance()->resourcePath()
+ QLatin1String("/Nokia") + androidFilename;
return QString::fromLatin1("%1/qtcreator/android.xml").arg(
QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath());
}
bool androidDevicesLessThan(const AndroidDevice &dev1, const AndroidDevice &dev2)
......
......@@ -53,12 +53,13 @@
#include <windows.h>
#include <psapi.h>
#include "app_version.h"
using namespace RegistryAccess;
enum { debug = 0 };
static const char titleC[] = "Qt Creator Debugger";
static const char organizationC[] = "Nokia";
// Optional
static const WCHAR debuggerWow32RegistryKeyC[] = L"Software\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug";
......@@ -468,7 +469,7 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
QApplication::setApplicationName(QLatin1String(titleC));
QApplication::setOrganizationName(QLatin1String(organizationC));
QApplication::setOrganizationName(QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR));
QString errorMessage;
if (!parseArguments(QApplication::arguments(), &errorMessage)) {
......
......@@ -8,3 +8,8 @@ DESTDIR=../../../bin
target.path=/bin
INSTALLS+=target
include(../../../qtcreator.pri)
app_info.input = $$PWD/../../app/app_version.h.in
app_info.output = $$OUT_PWD/app_version.h
QMAKE_SUBSTITUTES += app_info
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment