summaryrefslogtreecommitdiffstats
path: root/src/widgets/dialogs
diff options
context:
space:
mode:
authorChristoph Schleifenbaum <christoph.schleifenbaum@kdab.com>2012-01-31 16:15:51 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-14 02:48:35 +0100
commit2907fbd8982203053a16a0cf8a6c4b72b2c61984 (patch)
treeda0645311d547afe921a053616aa1bf42b7478d7 /src/widgets/dialogs
parent647aa53d72ad15f39dea676b97f6b4b21f8c9143 (diff)
Add QCocoaColor- and FontDialogHelper
Change-Id: Ie6e648e9e1f4ffbb34d73f9afdd6cc77e86bc3d1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/dialogs')
-rw-r--r--src/widgets/dialogs/qcolordialog.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 4a91443d00..263d3a623c 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1440,7 +1440,7 @@ void QColorDialogPrivate::init(const QColor &initial)
q->setSizeGripEnabled(false);
q->setWindowTitle(QColorDialog::tr("Select Color"));
- nativeDialogInUse = false;
+ nativeDialogInUse = (platformColorDialogHelper() != 0);
nextCust = 0;
QVBoxLayout *mainLay = new QVBoxLayout(q);
@@ -1697,10 +1697,6 @@ void QColorDialog::setCurrentColor(const QColor &color)
d->selectColor(color);
d->setCurrentAlpha(color.alpha());
-#ifdef Q_WS_MAC
- d->setCurrentQColor(color);
- d->setCocoaPanelColor(color);
-#endif
// ### fixme: Call helper
if (d->nativeDialogInUse)
d->platformColorDialogHelper()->setCurrentColor_sys(color);