feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Prepare Qt Creator to have a flexible settings-path.

Browse Source 
Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
tjenssen
2012-05-10 16:19:10 +02:00
committed by Eike Ziller
parent e271000bf7
commit bbfc49fe4d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidconfigurations.cpp
View File

@@ -82,13 +82,12 @@ namespace {
const QLatin1String Unknown("unknown"); const QLatin1String Unknown("unknown");
const QLatin1String keytoolName("keytool"); const QLatin1String keytoolName("keytool");
const QLatin1String jarsignerName("jarsigner"); const QLatin1String jarsignerName("jarsigner");
const QLatin1String androidFilename("/android.xml");
const QLatin1String changeTimeStamp("ChangeTimeStamp"); const QLatin1String changeTimeStamp("ChangeTimeStamp");
static QString settingsFileName() static QString settingsFileName()
{ {
return Core::ICore::instance()->resourcePath() return QString::fromLatin1("%1/qtcreator/android.xml").arg(
+ QLatin1String("/Nokia") + androidFilename; QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath());
} }
bool androidDevicesLessThan(const AndroidDevice &dev1, const AndroidDevice &dev2) bool androidDevicesLessThan(const AndroidDevice &dev1, const AndroidDevice &dev2)

5
src/tools/qtcdebugger/main.cpp
View File

@@ -53,12 +53,13 @@
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#include "app_version.h"
using namespace RegistryAccess; using namespace RegistryAccess;
enum { debug = 0 }; enum { debug = 0 };
static const char titleC[] = "Qt Creator Debugger"; static const char titleC[] = "Qt Creator Debugger";
static const char organizationC[] = "Nokia";
// Optional // Optional
static const WCHAR debuggerWow32RegistryKeyC[] = L"Software\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug"; 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 a(argc, argv);
QApplication::setApplicationName(QLatin1String(titleC)); QApplication::setApplicationName(QLatin1String(titleC));
QApplication::setOrganizationName(QLatin1String(organizationC)); QApplication::setOrganizationName(QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR));
QString errorMessage; QString errorMessage;
if (!parseArguments(QApplication::arguments(), &errorMessage)) { if (!parseArguments(QApplication::arguments(), &errorMessage)) {

5
src/tools/qtcdebugger/qtcdebugger.pro
View File

@@ -8,3 +8,8 @@ DESTDIR=../../../bin
target.path=/bin target.path=/bin
INSTALLS+=target 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