From f98901601fee4947fd0248f113b3a39a142292d5 Mon Sep 17 00:00:00 2001 From: Iain Date: Mon, 25 Jan 2010 10:23:31 +0000 Subject: Updates to new Symbian DEF file system Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen --- configure.exe | Bin 1178624 -> 1178112 bytes src/qbase.pri | 2 +- tools/configure/configureapp.cpp | 16 +++++++++------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.exe b/configure.exe index 03cbf37..ed2b0b2 100644 Binary files a/configure.exe and b/configure.exe differ diff --git a/src/qbase.pri b/src/qbase.pri index 3307ae3..710a2b6 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -103,7 +103,7 @@ symbian { # of Qt, and the only compatibility will be between this build of Qt and anything # built in this exact environment. *Never* use this when building a version # for release. - contains(QT_CONFIG, def_files) { + contains(CONFIG, def_files) { defFilePath=../s60installs } } diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 3f105b5..7751143 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1829,9 +1829,9 @@ bool Configure::displayHelp() desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt."); desc( "-fpu ", "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2"); desc("S60", "no", "-no-s60", "Do not compile in S60 support."); - desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework\n"); - desc("SYMBIAN_DEFFILES", "no", "no-usedeffiles", "Disable the usage of DEF files."); - desc("SYMBIAN_DEFFILES", "yes", "usedeffiles", "Enable the usage of DEF files.\n"); + desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework"); + desc("SYMBIAN_DEFFILES", "no", "-no-usedeffiles", "Disable the usage of DEF files."); + desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles", "Enable the usage of DEF files.\n"); return true; } return false; @@ -2753,10 +2753,12 @@ void Configure::generateCachefile() if ( dictionary["PLUGIN_MANIFESTS"] == "no" ) configStream << " no_plugin_manifest"; - if ( dictionary["SYMBIAN_DEFFILES"] == "yes" ) { - configStream << " def_files"; - } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) { - configStream << " def_files_disabled"; + if ( dictionary.contains("SYMBIAN_DEFFILES") ) { + if(dictionary["SYMBIAN_DEFFILES"] == "yes" ) { + configStream << " def_files"; + } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) { + configStream << " def_files_disabled"; + } } configStream << endl; configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; -- cgit v0.12 From 56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jan 2010 19:11:25 +0100 Subject: Fix broken build of simulated QS60Style The QProgressBar animating code is not meant for the simulated style. ifdef it out. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp --- src/gui/styles/qs60style.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 3f4f190..24b2d34 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2964,11 +2964,13 @@ void QS60Style::unpolish(QWidget *widget) if (widget) widget->setPalette(QPalette()); -#ifndef QT_NO_PROGRESSBAR +#if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR) if (QProgressBar *bar = qobject_cast(widget)) { widget->removeEventFilter(this); d->m_bars.removeAll(bar); } +#else + Q_UNUSED(d) #endif QCommonStyle::unpolish(widget); } -- cgit v0.12 From c7636e37e62b8df54cad331989be3173ba4ca27d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jan 2010 19:28:36 +0100 Subject: Remove warnings MSVC revealed some issues that are worth a warning. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp --- src/gui/styles/qs60style.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 24b2d34..ecb3242 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1985,7 +1985,6 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, */ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const { - Q_D(const QS60Style); const QS60StylePrivate::SkinElementFlags flags = (option->state & State_Enabled) ? QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled; bool commonStyleDraws = false; @@ -2021,8 +2020,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti QS60StyleEnums::SP_QgnIndiCheckboxOn : QS60StyleEnums::SP_QgnIndiCheckboxOff; painter->save(); - QColor themeColor = QS60StylePrivate::themePalette()->windowText().color(); - QColor windowTextColor = option->palette.windowText().color(); + const QColor themeColor = QS60StylePrivate::themePalette()->windowText().color(); + const QColor windowTextColor = option->palette.windowText().color(); if (themeColor != windowTextColor) painter->setPen(windowTextColor); @@ -2069,8 +2068,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti buttonRect.adjust(0, -newY, -1, -newY); painter->save(); - QColor themeColor = d->s60Color(QS60StyleEnums::CL_QsnTextColors, 6, option); - QColor buttonTextColor = option->palette.buttonText().color(); + const QColor themeColor = QS60StylePrivate::s60Color(QS60StyleEnums::CL_QsnTextColors, 6, option); + const QColor buttonTextColor = option->palette.buttonText().color(); if (themeColor != buttonTextColor) painter->setPen(buttonTextColor); else @@ -3002,9 +3001,8 @@ void QS60Style::unpolish(QApplication *application) */ bool QS60Style::event(QEvent *e) { - Q_D(QS60Style); - #ifdef QT_KEYPAD_NAVIGATION + Q_D(QS60Style); const QEvent::Type eventType = e->type(); if ((eventType == QEvent::FocusIn || eventType == QEvent::FocusOut || -- cgit v0.12 From 9eea7172d4d4984a111f009a60f5eaa0568fcf89 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 26 Jan 2010 19:31:01 +0100 Subject: Remove unneeded resources from QtGui QtGui contains loads of resources. 337,160 bytes just for qstyle. And since this is nearly exclusively full of PNG files, it won't really be compressed in the qt.sis package. And it will eat unneccessary Ram. This patch removes about 260,000 bytes of resources. We only want the 32-pixel big icons. No 16- and 129- pixel versions. Task-number: QTBUG-7277 Reviewed-by: Sami Merila modified: src/gui/kernel/qapplication.cpp new file: src/gui/styles/qstyle_s60.qrc modified: src/gui/styles/styles.pri --- src/gui/kernel/qapplication.cpp | 4 +- src/gui/styles/qstyle_s60.qrc | 137 ++++++++++++++++++++++++++++++++++++++++ src/gui/styles/styles.pri | 8 ++- 3 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 src/gui/styles/qstyle_s60.qrc diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 12fe797..4fe3900 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -121,8 +121,10 @@ extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp static void initResources() { -#ifdef Q_WS_WINCE +#if defined(Q_WS_WINCE) Q_INIT_RESOURCE(qstyle_wince); +#elif defined(Q_OS_SYMBIAN) + Q_INIT_RESOURCE(qstyle_s60); #else Q_INIT_RESOURCE(qstyle); #endif diff --git a/src/gui/styles/qstyle_s60.qrc b/src/gui/styles/qstyle_s60.qrc new file mode 100644 index 0000000..dbee38b --- /dev/null +++ b/src/gui/styles/qstyle_s60.qrc @@ -0,0 +1,137 @@ + + + +images/filelink-32.png + + +images/file-32.png + + +images/newdirectory-32.png + + +images/parentdir-32.png + + + + + + + + + + + +images/harddrive-32.png + + + + + + + + + + +images/desktop-32.png + +images/dirclosed-32.png + + +images/dirlink-32.png + + +images/diropen-32.png + + +images/left-32.png + + +images/right-32.png + + +images/up-32.png + + +images/down-32.png + + +images/filecontents-32.png + + +images/fileinfo-32.png + + +images/viewdetailed-32.png + + +images/viewlist-32.png + +images/fontbitmap-16.png +images/fonttruetype-16.png + + +images/standardbutton-apply-32.png + + +images/standardbutton-cancel-32.png + + +images/standardbutton-clear-32.png + + +images/standardbutton-close-32.png + + +images/standardbutton-delete-32.png + + +images/standardbutton-help-32.png + + +images/standardbutton-no-32.png + + +images/standardbutton-ok-32.png + + +images/standardbutton-open-32.png + + +images/standardbutton-save-32.png + + +images/standardbutton-yes-32.png +images/standardbutton-closetab-16.png +images/standardbutton-closetab-down-16.png +images/standardbutton-closetab-hover-16.png + +images/refresh-32.png + +images/stop-32.png + +images/media-stop-32.png + +images/media-play-32.png + +images/media-pause-32.png + +images/media-seek-forward-32.png + +images/media-seek-backward-32.png + +images/media-skip-forward-32.png + +images/media-skip-backward-32.png +images/media-volume-16.png +images/media-volume-muted-16.png + + + diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index f30f5af..676f59e 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -23,10 +23,12 @@ SOURCES += \ styles/qstylesheetstyle.cpp \ styles/qstylesheetstyle_default.cpp -!wince* { - RESOURCES += styles/qstyle.qrc +wince* { + RESOURCES += styles/qstyle_wince.qrc +} else:symbian { + RESOURCES += styles/qstyle_s60.qrc } else { - RESOURCES += styles/qstyle_wince.qrc + RESOURCES += styles/qstyle.qrc } contains( styles, all ) { -- cgit v0.12