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/widgets/dialogs/qcolordialog.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/widgets/dialogs/qcolordialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index be60ea60b0..93e49466cb 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -57,7 +57,9 @@ #include "qpainter.h" #include "qpixmap.h" #include "qpushbutton.h" +#if QT_CONFIG(settings) #include "qsettings.h" +#endif #include "qsharedpointer.h" #include "qstyle.h" #include "qstyleoption.h" |