From 2907fbd8982203053a16a0cf8a6c4b72b2c61984 Mon Sep 17 00:00:00 2001 From: Christoph Schleifenbaum Date: Tue, 31 Jan 2012 16:15:51 +0100 Subject: Add QCocoaColor- and FontDialogHelper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie6e648e9e1f4ffbb34d73f9afdd6cc77e86bc3d1 Reviewed-by: Morten Johan Sørvig --- src/widgets/dialogs/qcolordialog.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/widgets/dialogs') 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); -- cgit v1.2.3