diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-28 12:33:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-28 12:33:32 +0100 |
| commit | ad809526d63b2c6a1dd94282fa0a807f72ee580d (patch) | |
| tree | 05501efa0dae0b4b8cf72d254efbbbab2ad3cb2d /src/plugins/platforms/qnx/qqnxtheme.cpp | |
| parent | 9149f31aeaf3fce0c5ba5c20da0b9f2b56368abb (diff) | |
| parent | c7cca2dd74bcfb0a2020fbb537fd47b50b2775c0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/qnx/qqnxtheme.cpp
src/widgets/dialogs/qfileinfogatherer.cpp
src/widgets/dialogs/qfilesystemmodel.cpp
Change-Id: Ifa536969c4beafcdfeebbf6beda1674b86750be8
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxtheme.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxtheme.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qqnxtheme.cpp b/src/plugins/platforms/qnx/qqnxtheme.cpp index ae9acd845e..c0aef07bd9 100644 --- a/src/plugins/platforms/qnx/qqnxtheme.cpp +++ b/src/plugins/platforms/qnx/qqnxtheme.cpp @@ -76,10 +76,11 @@ QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) co switch (type) { case QPlatformTheme::FileDialog: return new QQnxFileDialogHelper(m_integration); -#ifndef QT_NO_COLORDIALOG +#endif +#if !defined(QT_NO_COLORDIALOG) case QPlatformTheme::ColorDialog: #endif -#ifndef QT_NO_FONTDIALOG +#if !defined(QT_NO_FONTDIALOG) case QPlatformTheme::FontDialog: #endif default: |