diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-02-19 09:43:35 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-02-19 09:43:35 (GMT) |
| commit | db0057534835356f5c471f3e0f32fad30e32becb (patch) | |
| tree | 264b16befccde643720186f15b5578e5c3eb2819 /src/gui/dialogs | |
| parent | be1819ffd617322be2398dad928ec03cf5c10b19 (diff) | |
| download | Qt-db0057534835356f5c471f3e0f32fad30e32becb.zip Qt-db0057534835356f5c471f3e0f32fad30e32becb.tar.gz Qt-db0057534835356f5c471f3e0f32fad30e32becb.tar.bz2 | |
ColorDialog is always shown as stripped-down version (for QVGA)
QColorDialog creates own instance of S60Data and fetches touch support
value from that. Unfortunately, newly created S60Data is populated
with default values that claim no support for touch.
As a fix, QColorDialog uses the global variable "S60" to fetch touch
support information.
Task-number: QTBUG-8322
Reviewed-by: Shane Kearns
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 |