From 40c70459b40e4e54c2cf515f502824c8d191626b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 15 Jun 2009 17:33:09 +0200 Subject: Remove compiler warning on Qt/Windows The QFileDialogPrivate constructor must be non-inline. RevBy: Harald Fernengel --- src/gui/image/qpicture.cpp | 12 ++++++++++++ src/gui/image/qpicture_p.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 8528173..a16305e 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -1041,6 +1041,18 @@ QPicture& QPicture::operator=(const QPicture &p) /*! \internal + Constructs a QPicturePrivate +*/ +QPicturePrivate::QPicturePrivate() + : in_memory_only(false), + q_ptr(0) +{ + ref = 1; +} + +/*! + \internal + Sets formatOk to false and resets the format version numbers to default */ diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h index e0c3117..373ff15 100644 --- a/src/gui/image/qpicture_p.h +++ b/src/gui/image/qpicture_p.h @@ -143,7 +143,7 @@ public: PdcReservedStop = 199 // for Qt }; - inline QPicturePrivate() : in_memory_only(false), q_ptr(0) { ref = 1; } + QPicturePrivate(); QAtomicInt ref; bool checkFormat(); -- cgit v0.12 From d476a0054aff074f83600fcc12d7e9356b920da3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 15 Jun 2009 18:14:08 +0200 Subject: Remove warnings --- src/gui/styles/qs60style.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c6118d6..d9ef8ef 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -559,7 +559,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, QRect endRect; if (orientation == Qt::Horizontal) { - startRect.setWidth(qMin(rect.width() >>1 - 1, startRect.width())); + startRect.setWidth(qMin((rect.width() >> 1) - 1, startRect.width())); endRect = startRect.translated(rect.width() - startRect.width(), 0); middleRect.adjust(startRect.width(), 0, -startRect.width(), 0); if (startRect.bottomRight().x() > endRect.topLeft().x()) { @@ -568,7 +568,7 @@ void QS60StylePrivate::drawRow(QS60StyleEnums::SkinParts start, endRect.adjust(overlap,0,0,0); } } else { - startRect.setHeight(qMin(rect.height() >>1 - 1, startRect.height())); + startRect.setHeight(qMin((rect.height() >> 1) - 1, startRect.height())); endRect = startRect.translated(0, rect.height() - startRect.height()); middleRect.adjust(0, startRect.height(), 0, -startRect.height()); if (startRect.topRight().y() > endRect.bottomLeft().y()) { -- cgit v0.12 From 12b4262f1f6e5d7560c0495096e86668cdf69cad Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Mon, 15 Jun 2009 18:16:49 +0200 Subject: added sendui.lib to qtgui --- mkspecs/common/symbian/symbian.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 663a1df..7b78033 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -62,8 +62,8 @@ QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script -QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lplatformenv -lcommonui -letext -lapmime -QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl +QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lsendui -lplatformenv -lcommonui -letext -lapmime +QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv -- cgit v0.12 From 82e19a10f13005a327b134999315ecf39d5d70e3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 15 Jun 2009 19:40:18 +0200 Subject: Fix for Task #256174 Bring back the keyPad Navigation focus visualization. It disappeared with commit e0690577327097ec3d9be99205bfcf01f8404d23 --- src/gui/styles/qs60style.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index c6118d6..1292092 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2038,16 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti #endif //QT_NO_SPINBOX case PE_FrameFocusRect: // Calendar widget and combox both do not use styled itemDelegate - if ( widget && ( + if (!(false #ifndef QT_NO_CALENDARWIDGET - (qobject_cast(widget->parent())) -#else - false + || (widget && qobject_cast(widget->parent())) #endif //QT_NO_CALENDARWIDGET #ifndef QT_NO_COMBOBOX || (qobject_cast(widget)) -#else - || false #endif //QT_NO_COMBOBOX )) { // no focus selection for touch @@ -2326,6 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w break; case SH_UnderlineShortcut: retValue = 0; + break; default: break; } -- cgit v0.12 From de3e3d6bff2b585524cd504cf052cf181a6c2eae Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 15 Jun 2009 23:29:19 +0200 Subject: Fix commit 82e19a10f13005a327b134999315ecf39d5d70e3 --- src/gui/styles/qs60style.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 29827b7..d2bd679 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2038,12 +2038,12 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti #endif //QT_NO_SPINBOX case PE_FrameFocusRect: // Calendar widget and combox both do not use styled itemDelegate - if (!(false + if (widget && !(false #ifndef QT_NO_CALENDARWIDGET - || (widget && qobject_cast(widget->parent())) + || qobject_cast(widget->parent()) #endif //QT_NO_CALENDARWIDGET #ifndef QT_NO_COMBOBOX - || (qobject_cast(widget)) + || qobject_cast(widget) #endif //QT_NO_COMBOBOX )) { // no focus selection for touch @@ -2322,7 +2322,7 @@ int QS60Style::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w break; case SH_UnderlineShortcut: retValue = 0; - break; + break; default: break; } -- cgit v0.12 From 4f734500e1833d43805d39747f94bb77e47ebbe3 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 16 Jun 2009 09:23:24 +0300 Subject: New screenshots for S60 fluidlauncher. --- demos/embedded/fluidlauncher/config_s60/config.xml | 18 +++++++++--------- .../embedded/fluidlauncher/screenshots/context2d.png | Bin 23995 -> 0 bytes .../fluidlauncher/screenshots/context2d_s60.png | Bin 0 -> 49182 bytes .../fluidlauncher/screenshots/desktopservices.png | Bin 43341 -> 0 bytes .../fluidlauncher/screenshots/desktopservices_s60.png | Bin 0 -> 38216 bytes .../embedded/fluidlauncher/screenshots/drilldown.png | Bin 102922 -> 0 bytes .../fluidlauncher/screenshots/drilldown_s60.png | Bin 0 -> 60089 bytes .../screenshots/embeddedsvgviewer_s60.png | Bin 0 -> 42764 bytes .../fluidlauncher/screenshots/fridgemagnets.png | Bin 50464 -> 0 bytes .../fluidlauncher/screenshots/fridgemagnets_s60.png | Bin 0 -> 45318 bytes demos/embedded/fluidlauncher/screenshots/ftp.png | Bin 29831 -> 0 bytes demos/embedded/fluidlauncher/screenshots/ftp_s60.png | Bin 0 -> 38370 bytes .../fluidlauncher/screenshots/saxbookmarks.png | Bin 27098 -> 0 bytes .../fluidlauncher/screenshots/saxbookmarks_s60.png | Bin 0 -> 56905 bytes .../fluidlauncher/screenshots/styledemo_s60.png | Bin 0 -> 63062 bytes .../embedded/fluidlauncher/screenshots/wiggly_s60.png | Bin 0 -> 7950 bytes 16 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 demos/embedded/fluidlauncher/screenshots/context2d.png create mode 100644 demos/embedded/fluidlauncher/screenshots/context2d_s60.png delete mode 100644 demos/embedded/fluidlauncher/screenshots/desktopservices.png create mode 100644 demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png delete mode 100644 demos/embedded/fluidlauncher/screenshots/drilldown.png create mode 100644 demos/embedded/fluidlauncher/screenshots/drilldown_s60.png create mode 100644 demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png delete mode 100644 demos/embedded/fluidlauncher/screenshots/fridgemagnets.png create mode 100644 demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png delete mode 100644 demos/embedded/fluidlauncher/screenshots/ftp.png create mode 100644 demos/embedded/fluidlauncher/screenshots/ftp_s60.png delete mode 100644 demos/embedded/fluidlauncher/screenshots/saxbookmarks.png create mode 100644 demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png create mode 100644 demos/embedded/fluidlauncher/screenshots/styledemo_s60.png create mode 100644 demos/embedded/fluidlauncher/screenshots/wiggly_s60.png diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml index 41b3b6d..0cde71b 100644 --- a/demos/embedded/fluidlauncher/config_s60/config.xml +++ b/demos/embedded/fluidlauncher/config_s60/config.xml @@ -1,17 +1,17 @@ - - + + - - - - - - - + + + + + + + diff --git a/demos/embedded/fluidlauncher/screenshots/context2d.png b/demos/embedded/fluidlauncher/screenshots/context2d.png deleted file mode 100644 index d571546..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/context2d.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/context2d_s60.png b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png new file mode 100644 index 0000000..a53f5b0 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/context2d_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices.png b/demos/embedded/fluidlauncher/screenshots/desktopservices.png deleted file mode 100644 index a8d82ce..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/desktopservices.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png new file mode 100644 index 0000000..f4aa1a2 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/desktopservices_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown.png b/demos/embedded/fluidlauncher/screenshots/drilldown.png deleted file mode 100644 index 413d713..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/drilldown.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png new file mode 100644 index 0000000..50376c1 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/drilldown_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png new file mode 100644 index 0000000..11459dc Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/embeddedsvgviewer_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png deleted file mode 100644 index 87b9099..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/fridgemagnets.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png new file mode 100644 index 0000000..56da9dc Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/fridgemagnets_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/ftp.png b/demos/embedded/fluidlauncher/screenshots/ftp.png deleted file mode 100644 index fae7ffc..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/ftp.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/ftp_s60.png b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png new file mode 100644 index 0000000..ea6a321 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/ftp_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png deleted file mode 100644 index 6a2b07f..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/saxbookmarks.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png new file mode 100644 index 0000000..c451198 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/saxbookmarks_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png new file mode 100644 index 0000000..bad9692 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/styledemo_s60.png differ diff --git a/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png new file mode 100644 index 0000000..690ab48 Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/wiggly_s60.png differ -- cgit v0.12 From df299de9748adb2cdb21834956907076971ff45d Mon Sep 17 00:00:00 2001 From: Markku Luukkainen Date: Tue, 16 Jun 2009 09:44:07 +0200 Subject: Bugfix. Softkeys were set to wrong widget when combobox was focused. --- examples/widgets/softkeys/softkeys.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp index 9672aee..e717510 100644 --- a/examples/widgets/softkeys/softkeys.cpp +++ b/examples/widgets/softkeys/softkeys.cpp @@ -127,7 +127,9 @@ void MainWindow::addSoftKeys() QList softkeys; softkeys.append(ok); softkeys.append(cancel); - pushButton->setSoftKeys(softkeys); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKeys(softkeys); } void MainWindow::exitApplication() @@ -138,13 +140,17 @@ void MainWindow::exitApplication() void MainWindow::okPressed() { infoLabel->setText(tr("OK pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } void MainWindow::cancelPressed() { infoLabel->setText(tr("Cancel pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } -- cgit v0.12 From 02f0cc5c834c0c45a6191f5f4f3c8c4c1b21d70e Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Tue, 16 Jun 2009 09:58:00 +0200 Subject: Revert "added sendui.lib to qtgui" library was removed on purpose, linking issues shouldn't happen. This reverts commit 12b4262f1f6e5d7560c0495096e86668cdf69cad. --- mkspecs/common/symbian/symbian.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 7b78033..663a1df 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -62,8 +62,8 @@ QMAKE_LFLAGS_DLL = -shared QMAKE_LINK_OBJECT_MAX = 10 QMAKE_LINK_OBJECT_SCRIPT= object_script -QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lsendui -lplatformenv -lcommonui -letext -lapmime -QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl +QMAKE_DESKTOPSERVICES_LIBS = -lsendas2 -lplatformenv -lcommonui -letext -lapmime +QMAKE_STATUSPANE_LIBS = -lavkon -leikcoctl QMAKE_LIBS = -llibc -llibm -leuser -llibdl QMAKE_LIBS_CORE = $$QMAKE_LIBS -llibpthread -lefsrv -- cgit v0.12