diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
| commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
| tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/imports/localstorage | |
| parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
| parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
Diffstat (limited to 'src/imports/localstorage')
| -rw-r--r-- | src/imports/localstorage/plugin.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index f59ccc551e..7d96f11768 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -149,12 +149,7 @@ public: using namespace QV4; -QT_WARNING_PUSH -#if (Q_CC_GNU >= 600) -QT_WARNING_DISABLE_GCC("-Wtautological-compare") -#endif DEFINE_OBJECT_VTABLE(QV4::QQmlSqlDatabaseWrapper); -QT_WARNING_POP |