diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:54:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:54:57 (GMT) |
| commit | ce27cf24539e0c7971937e55d8539496ad51ee52 (patch) | |
| tree | 86ddea82eca7e682409cbc2c568594a0116062c6 /src/gui/dialogs | |
| parent | 6f44020cf97bd74e02ee011e6cb182aa93109b21 (diff) | |
| parent | 1f10c6be975a2d36c05d926b332b869ad6339877 (diff) | |
| download | Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.zip Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.gz Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qcolordialog.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp index 83ecc30..e6abf7f 100644 --- a/src/gui/dialogs/qcolordialog.cpp +++ b/src/gui/dialogs/qcolordialog.cpp @@ -1078,8 +1078,7 @@ QColorShower::QColorShower(QColorDialog *parent) #ifdef QT_SMALL_COLORDIALOG # ifdef Q_WS_S60 - QS60Data s60Data = QS60Data(); - const bool nonTouchUI = !s60Data.hasTouchscreen; + const bool nonTouchUI = !S60->hasTouchscreen; # elif defined Q_WS_MAEMO_5 const bool nonTouchUI = false; # endif @@ -1506,8 +1505,7 @@ void QColorDialogPrivate::init(const QColor &initial) #if defined(QT_SMALL_COLORDIALOG) # if defined(Q_WS_S60) - QS60Data s60Data = QS60Data(); - const bool nonTouchUI = !s60Data.hasTouchscreen; + const bool nonTouchUI = !S60->hasTouchscreen; # elif defined(Q_WS_MAEMO_5) const bool nonTouchUI = false; # endif |