diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
| commit | 4d180586cddbd71a67c83246db3bec1caa595e05 (patch) | |
| tree | 0970def686b4e28e9cf6a3f0fc897e05bb0a9fbc /src/corelib/io/qsettings.cpp | |
| parent | 6b088b7a1da37511a8abb1503e4f2f95632dbdac (diff) | |
| parent | 527406cbd99f44470ef87468b73c18df949e8ac7 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
Change-Id: I66a08c770767a93cd26535689e3e7806486aab06
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 8b9f7bc9e5..a0de5ac2b1 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -41,8 +41,6 @@ #include "qplatformdefs.h" #include "qsettings.h" -#ifndef QT_NO_SETTINGS - #include "qsettings_p.h" #include "qcache.h" #include "qfile.h" @@ -3584,5 +3582,3 @@ QT_END_NAMESPACE #ifndef QT_BOOTSTRAPPED #include "moc_qsettings.cpp" #endif - -#endif // QT_NO_SETTINGS |