forked from qt-creator/qt-creator
ProfileManager: Create the desktop profile as manual
This allows our users to change/remove it. Task-number: QTCREATORBUG-7568 Change-Id: Ie004eb73ceb4a4c77882db037609af4a3f226081 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -174,12 +174,6 @@ void ProfileManager::restoreProfiles()
|
|||||||
|
|
||||||
// Then auto create profiles:
|
// Then auto create profiles:
|
||||||
QList<Profile *> detectedSts;
|
QList<Profile *> detectedSts;
|
||||||
Profile *defaultProfile = new Profile; // One profile using default values
|
|
||||||
defaultProfile->setDisplayName(tr("Desktop"));
|
|
||||||
defaultProfile->setAutoDetected(true);
|
|
||||||
defaultProfile->setIconPath(QLatin1String(":///DESKTOP///"));
|
|
||||||
|
|
||||||
detectedSts << defaultProfile;
|
|
||||||
|
|
||||||
// Find/update autodetected profiles:
|
// Find/update autodetected profiles:
|
||||||
Profile *toStore = 0;
|
Profile *toStore = 0;
|
||||||
@@ -201,10 +195,19 @@ void ProfileManager::restoreProfiles()
|
|||||||
// Delete all loaded autodetected profiles that were not rediscovered:
|
// Delete all loaded autodetected profiles that were not rediscovered:
|
||||||
qDeleteAll(stsToCheck);
|
qDeleteAll(stsToCheck);
|
||||||
|
|
||||||
// Store manual tool chains
|
// Store manual profiles
|
||||||
foreach (Profile *p, stsToRegister)
|
foreach (Profile *p, stsToRegister)
|
||||||
addProfile(p);
|
addProfile(p);
|
||||||
|
|
||||||
|
if (profiles().isEmpty()) {
|
||||||
|
Profile *defaultProfile = new Profile; // One profile using default values
|
||||||
|
defaultProfile->setDisplayName(tr("Desktop"));
|
||||||
|
defaultProfile->setAutoDetected(false);
|
||||||
|
defaultProfile->setIconPath(QLatin1String(":///DESKTOP///"));
|
||||||
|
|
||||||
|
addProfile(defaultProfile);
|
||||||
|
}
|
||||||
|
|
||||||
Profile *p = find(userProfiles.defaultProfile);
|
Profile *p = find(userProfiles.defaultProfile);
|
||||||
if (p)
|
if (p)
|
||||||
setDefaultProfile(p);
|
setDefaultProfile(p);
|
||||||
|
Reference in New Issue
Block a user