diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-03-18 14:46:29 +0100 |
| commit | 868428cc634f0e2c6d5ace84555675cb80363d3f (patch) | |
| tree | 98d321520f31107067ca45e5b5806d92551b2f3d /src/plugins/beautifier | |
| parent | 0d303db8c2e79c772cd216bfc07b42637c37e1bd (diff) | |
| parent | 93184f7959bd18ba6f77e8d8b312f0e3be95d70c (diff) | |
| download | qt-creator-868428cc634f0e2c6d5ace84555675cb80363d3f.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
Diffstat (limited to 'src/plugins/beautifier')
| -rw-r--r-- | src/plugins/beautifier/artisticstyle/artisticstyle.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/beautifier/beautifier.qbs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp index f9beea916f..b9b4d0bb4f 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp @@ -118,11 +118,12 @@ void ArtisticStyle::formatFile() } if (cfgFileName.isEmpty() && m_settings->useHomeFile()) { - QString file = QDir::home().filePath(QLatin1String(".astylerc")); + const QDir homeDirectory = QDir::home(); + QString file = homeDirectory.filePath(QLatin1String(".astylerc")); if (QFile::exists(file)) { cfgFileName = file; } else { - file = QDir::home().filePath(QLatin1String("astylerc")); + file = homeDirectory.filePath(QLatin1String("astylerc")); if (QFile::exists(file)) cfgFileName = file; } diff --git a/src/plugins/beautifier/beautifier.qbs b/src/plugins/beautifier/beautifier.qbs index 78ef3327ee..685f996e95 100644 --- a/src/plugins/beautifier/beautifier.qbs +++ b/src/plugins/beautifier/beautifier.qbs @@ -1,4 +1,4 @@ -import qbs.base 1.0 +import qbs 1.0 import QtcPlugin |