diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-31 17:48:12 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-31 18:16:11 +0200 |
| commit | 9061a660fa596298161354827935cc9a90eb5cb6 (patch) | |
| tree | 1d743042a6135b3b1826b569dfa8982965a05855 | |
| parent | e6b42646fd477daf31caf52ead3f9452f340c114 (diff) | |
remove deprecated qbsPath preferences key
Change-Id: I8ef371816ce6a25521c70fcdfe74480ddc2cfae9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | src/lib/corelib/tools/preferences.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/lib/corelib/tools/preferences.cpp b/src/lib/corelib/tools/preferences.cpp index 174944dbf..83c28a44c 100644 --- a/src/lib/corelib/tools/preferences.cpp +++ b/src/lib/corelib/tools/preferences.cpp @@ -88,17 +88,7 @@ QString Preferences::defaultBuildDirectory() const */ QStringList Preferences::searchPaths(const QString &baseDir) const { - const QStringList searchPaths = pathList(QLatin1String("qbsSearchPaths"), - baseDir + QLatin1String("/share/qbs")); - - // TODO: Remove in 1.2. - const QStringList deprecatedSearchPaths = getPreference(QLatin1String("qbsPath")).toString() - .split(Internal::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); - if (!deprecatedSearchPaths.isEmpty()) { - qDebug("Warning: preferences.qbsPath is deprecated, " - "use preferences.qbsSearchPaths instead."); - } - return deprecatedSearchPaths + searchPaths; + return pathList(QLatin1String("qbsSearchPaths"), baseDir + QLatin1String("/share/qbs")); } /*! |