forked from qt-creator/qt-creator
Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
@@ -97,10 +97,10 @@
|
||||
#include <QStackedWidget>
|
||||
#include <QTextStream>
|
||||
|
||||
#include <QDesktopServices>
|
||||
#include <QItemDelegate>
|
||||
#include <QPlainTextEdit>
|
||||
#include <QShortcut>
|
||||
#include <QStandardPaths>
|
||||
#include <QTextBlock>
|
||||
#include <QTextCursor>
|
||||
#include <QTextEdit>
|
||||
@@ -1379,7 +1379,7 @@ void FakeVimPluginPrivate::maybeReadVimRc()
|
||||
return;
|
||||
QString fileName = theFakeVimSetting(ConfigVimRcPath)->value().toString();
|
||||
if (fileName.isEmpty()) {
|
||||
fileName = QDesktopServices::storageLocation(QDesktopServices::HomeLocation)
|
||||
fileName = QStandardPaths::writableLocation(QStandardPaths::HomeLocation)
|
||||
+ (Utils::HostOsInfo::isWindowsHost() ? _("/_vimrc") : _("/.vimrc"));
|
||||
}
|
||||
//qDebug() << "READING VIMRC: " << fileName;
|
||||
|
||||
Reference in New Issue
Block a user