Revert "Add sam-ba location to list of settings that must not be imported"
This reverts commit 1bb6a82cf3.
This commit is contained in:
@@ -705,7 +705,7 @@ bool AppData::importSettings(QSettings & toSettings)
|
|||||||
QStringList excludeKeys = QStringList() << "compilation-server";
|
QStringList excludeKeys = QStringList() << "compilation-server";
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
// locations of tools which come with Companion distros
|
// locations of tools which come with Companion distros
|
||||||
excludeKeys << "avrdude_location" << "avrdudeLocation" << "dfu_location" << "samba_location" << "sambaLocation";
|
excludeKeys << "avrdude_location" << "avrdudeLocation" << "dfu_location";
|
||||||
// install-specific keys; "." is the "default" key which may contain install path
|
// install-specific keys; "." is the "default" key which may contain install path
|
||||||
excludeKeys << "Start Menu Folder" << ".";
|
excludeKeys << "Start Menu Folder" << ".";
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user