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:
@@ -306,8 +306,6 @@ QmlOutlineModel::QmlOutlineModel(QmlJSEditorDocument *document) :
|
||||
const QString resourcePath = Core::ICore::resourcePath();
|
||||
Icons::instance()->setIconFilesPath(resourcePath + QLatin1String("/qmlicons"));
|
||||
|
||||
// TODO: Maybe add a Copy Action?
|
||||
setSupportedDragActions(Qt::MoveAction);
|
||||
setItemPrototype(new QmlOutlineItem(this));
|
||||
}
|
||||
|
||||
@@ -410,6 +408,12 @@ Qt::ItemFlags QmlOutlineModel::flags(const QModelIndex &index) const
|
||||
return flags;
|
||||
}
|
||||
|
||||
Qt::DropActions QmlOutlineModel::supportedDragActions() const
|
||||
{
|
||||
// TODO: Maybe add a Copy Action?
|
||||
return Qt::MoveAction;
|
||||
}
|
||||
|
||||
|
||||
Document::Ptr QmlOutlineModel::document() const
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user