diff options
Diffstat (limited to 'src/widgets/dialogs/qcolordialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index e592f14704..263d3a623c 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1060,7 +1060,7 @@ QColorShower::QColorShower(QColorDialog *parent) gl->setMargin(gl->spacing()); lab = new QColorShowLabel(this); -#ifndef Q_WS_WINCE +#ifndef Q_OS_WINCE #ifdef QT_SMALL_COLORDIALOG lab->setMinimumHeight(60); #endif @@ -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); @@ -1452,7 +1452,7 @@ void QColorDialogPrivate::init(const QColor &initial) leftLay = 0; -#if defined(Q_WS_WINCE) || defined(QT_SMALL_COLORDIALOG) +#if defined(Q_OS_WINCE) || defined(QT_SMALL_COLORDIALOG) smallDisplay = true; const int lumSpace = 20; #else @@ -1477,7 +1477,7 @@ void QColorDialogPrivate::init(const QColor &initial) leftLay->addWidget(lblBasicColors); leftLay->addWidget(standard); -#if !defined(Q_WS_WINCE) +#if !defined(Q_OS_WINCE) leftLay->addStretch(); #endif @@ -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); |