diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-28 17:33:47 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-29 14:10:41 +0200 |
| commit | 1d5091e48f6df341dbd4436843c25afe25cbf4ce (patch) | |
| tree | 9151d71b36bcffbba219ef1a0fc4e4f234adbc89 /src/plugins/qmldesigner/components/navigator | |
| parent | 7ba0f8a4c42c5db144b599861f38d2e771e0dafe (diff) | |
| download | qt-creator-1d5091e48f6df341dbd4436843c25afe25cbf4ce.tar.gz | |
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>
Diffstat (limited to 'src/plugins/qmldesigner/components/navigator')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 91b2c657cd..6b982e9da1 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -113,8 +113,6 @@ NavigatorTreeModel::NavigatorTreeModel(QObject *parent) setColumnCount(2); # endif - setSupportedDragActions(Qt::LinkAction); - connect(this, SIGNAL(itemChanged(QStandardItem*)), this, SLOT(handleChangedItem(QStandardItem*))); } @@ -128,6 +126,11 @@ Qt::DropActions NavigatorTreeModel::supportedDropActions() const return Qt::LinkAction | Qt::MoveAction; } +Qt::DropActions NavigatorTreeModel::supportedDragActions() const +{ + return Qt::LinkAction; +} + QStringList NavigatorTreeModel::mimeTypes() const { QStringList types; diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h index 0c19a803e1..532ab5e846 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h @@ -90,6 +90,7 @@ public: ~NavigatorTreeModel(); Qt::DropActions supportedDropActions() const; + Qt::DropActions supportedDragActions() const; QStringList mimeTypes() const; QMimeData *mimeData(const QModelIndexList &indexes) const; diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 24809188b5..10d2889c55 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -133,7 +133,7 @@ void NavigatorView::modelAttached(Model *model) QTreeView *treeView = treeWidget(); treeView->expandAll(); - treeView->header()->setResizeMode(0, QHeaderView::Stretch); + treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch); treeView->header()->resizeSection(1,26); treeView->setRootIsDecorated(false); treeView->setIndentation(20); |