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

Help bookmarks: Remove reading old settings

Browse Source 
Change-Id: Iae6b9174871937ba7c04f710b8b7a55ca6027d81
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2017-04-24 10:18:07 +02:00
parent e063ca68d0
commit c702b543ed
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/help/bookmarkmanager.cpp
View File

@@ -719,13 +719,7 @@ void BookmarkManager::setupBookmarkModels()
QByteArray ba;
QSettings *settings = Core::ICore::settings();
if (settings->contains(QLatin1String(kBookmarksKey))) {
ba = settings->value(QLatin1String(kBookmarksKey)).toByteArray();
} else {
// read old settings from help engine
// TODO remove some time after Qt Creator 3.5
ba = LocalHelpManager::helpEngine().customValue(QLatin1String("Bookmarks")).toByteArray();
}
ba = settings->value(QLatin1String(kBookmarksKey)).toByteArray();
QDataStream stream(ba);
while (!stream.atEnd()) {
stream >> depth >> name >> type >> expanded;