diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:57:28 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-03 21:58:14 +0100 |
| commit | 23153fb8c5934ae22009f43efe90e06eebc977c0 (patch) | |
| tree | 546a0ac338c0770b709ebd08219443fabf5b9e83 /src/widgets/dialogs | |
| parent | 16aef5baa8ffeb8ad1c26727a12773ed2940e0de (diff) | |
| parent | 9e9b98aeea11e75db5a93299d70439370398b553 (diff) | |
Merge branch 'master' into stable
Change-Id: I5c0c9a131cca64fea3bc784339d14d84076edc1a
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 7b47f4e135..290f0a7f65 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -67,8 +67,10 @@ static inline int themeDialogType(const QDialog *dialog) if (qobject_cast<const QFileDialog *>(dialog)) return QPlatformTheme::FileDialog; #endif +#ifndef QT_NO_COLORDIALOG if (qobject_cast<const QColorDialog *>(dialog)) return QPlatformTheme::ColorDialog; +#endif #ifndef QT_NO_FONTDIALOG if (qobject_cast<const QFontDialog *>(dialog)) return QPlatformTheme::FontDialog; |