path: root/src/corelib/itemmodels/qsortfilterproxymodel.h
diff options
authorThiago Macieira <>2014-12-16 17:27:31 -0800
committerThiago Macieira <>2014-12-20 07:38:17 +0100
commit2e4b1a8334d4de585e90637c070ba9832a0608f1 (patch)
tree4eb33e95bf8f5d064b219bf271bc5c30cffd5de9 /src/corelib/itemmodels/qsortfilterproxymodel.h
parent5d366f7e422129ec0c229b78f247b66e4ba63a59 (diff)
There's a lot of code now requiring it. Any compiler that doesn't support the keyword is too old for Qt now. The last time anyone asked about this macro was for QTBUG-27393 and we don't know which compiler that was. As a necessity, this patch contains a reversal of a0c3a57aed5cde37017733e7cf5e41cc6a1174aa [ChangeLog][Compiler Specific Changes] Qt 5.5 now unconditionally uses the "using" keyword. Compilers that do not support this keyword are deprecated and will not be able to build Qt. Previous versions of Qt may or may not compile, as no testing was done to ensure it worked. Change-Id: Ief042f34aba555a095d1f342a0ee7ee9feadf42d Reviewed-by: Lars Knoll <> Reviewed-by: Jędrzej Nowacki <>
Diffstat (limited to 'src/corelib/itemmodels/qsortfilterproxymodel.h')
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h
index f2debb9bdf..9df785756c 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.h
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.h
@@ -117,11 +117,7 @@ protected:
void invalidateFilter();
- inline QObject *parent() const { return QObject::parent(); }
using QObject::parent;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;