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/qnx/bardescriptoreditorentrypointwidget.h | |
| 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/qnx/bardescriptoreditorentrypointwidget.h')
| -rw-r--r-- | src/plugins/qnx/bardescriptoreditorentrypointwidget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h index 820b8d1d34..5b67152249 100644 --- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.h +++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.h @@ -34,6 +34,7 @@ #include "bardescriptoreditorabstractpanelwidget.h" +#include <QPointer> #include <QStandardItemModel> QT_BEGIN_NAMESPACE @@ -91,7 +92,7 @@ private: QString localAssetPathFromDestination(const QString &path); QStringListModel *m_splashScreenModel; - QWeakPointer<QStandardItemModel> m_assetsModel; + QPointer<QStandardItemModel> m_assetsModel; QString m_prevIconPath; |