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

Plugin Tests: Create settings dir with QTemporaryDir

Browse Source 
Create a clean and unique settings directory for "-test" runs if no
settings path is provided explicitly.

Change-Id: Ida2f5a74d42a5292963dd8d5d1f9dcddcdd24fd4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2014-12-10 10:27:42 +01:00
parent fd6ba0e2a6
commit 16becbd29c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/main.cpp
View File

@@ -56,6 +56,7 @@
#include <QApplication> #include <QApplication>
#include <QMessageBox> #include <QMessageBox>
#include <QStandardPaths> #include <QStandardPaths>
#include <QTemporaryDir>
#ifdef ENABLE_QT_BREAKPAD #ifdef ENABLE_QT_BREAKPAD
#include <qtsystemexceptionhandler.h> #include <qtsystemexceptionhandler.h>
@@ -338,10 +339,14 @@ int main(int argc, char **argv)
testOptionProvided = true; testOptionProvided = true;
} }
} }
QScopedPointer<QTemporaryDir> temporaryCleanSettingsDir;
if (settingsPath.isEmpty() && testOptionProvided) { if (settingsPath.isEmpty() && testOptionProvided) {
settingsPath = QDir::tempPath() + QString::fromLatin1("/qtc-%1-test-settings") const QString settingsPathTemplate = QDir::cleanPath(QDir::tempPath()
.arg(QLatin1String(Core::Constants::IDE_VERSION_LONG)); + QString::fromLatin1("/qtc-test-settings-XXXXXX"));
settingsPath = QDir::cleanPath(settingsPath); temporaryCleanSettingsDir.reset(new QTemporaryDir(settingsPathTemplate));
if (!temporaryCleanSettingsDir->isValid())
return 1;
settingsPath = temporaryCleanSettingsDir->path();
} }
if (!settingsPath.isEmpty()) if (!settingsPath.isEmpty())
QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, settingsPath); QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, settingsPath);