diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:28:12 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-19 10:28:12 (GMT) |
| commit | cd79ee107935fcc6f2c8bd71ab61729a6198c495 (patch) | |
| tree | 2344a97ecbacef181c23168ca9ad603dcd845039 | |
| parent | 480f3df2eab9ad13e0d7ea1245158866a0b942bd (diff) | |
| parent | db0057534835356f5c471f3e0f32fad30e32becb (diff) | |
| download | Qt-cd79ee107935fcc6f2c8bd71ab61729a6198c495.zip Qt-cd79ee107935fcc6f2c8bd71ab61729a6198c495.tar.gz Qt-cd79ee107935fcc6f2c8bd71ab61729a6198c495.tar.bz2 | |
Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6
| -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 |