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 From 0cbf7654e90d5dbd00b89bb90a37df8c55b329cd Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 16 Jun 2009 11:38:57 +0300 Subject: Fixed fluidlauncher config for S60 and updated softkeys screenshot. --- demos/embedded/fluidlauncher/config_s60/config.xml | 20 ++++++++++---------- .../embedded/fluidlauncher/screenshots/softkeys.png | Bin 42853 -> 0 bytes .../fluidlauncher/screenshots/softkeys_s60.png | Bin 0 -> 40149 bytes 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 demos/embedded/fluidlauncher/screenshots/softkeys.png create mode 100644 demos/embedded/fluidlauncher/screenshots/softkeys_s60.png diff --git a/demos/embedded/fluidlauncher/config_s60/config.xml b/demos/embedded/fluidlauncher/config_s60/config.xml index 1a9d397..92d9123 100644 --- a/demos/embedded/fluidlauncher/config_s60/config.xml +++ b/demos/embedded/fluidlauncher/config_s60/config.xml @@ -1,18 +1,18 @@ - - + + - - - - - - - - + + + + + + + + diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys.png b/demos/embedded/fluidlauncher/screenshots/softkeys.png deleted file mode 100644 index 99681b9..0000000 Binary files a/demos/embedded/fluidlauncher/screenshots/softkeys.png and /dev/null differ diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png new file mode 100644 index 0000000..03989fb Binary files /dev/null and b/demos/embedded/fluidlauncher/screenshots/softkeys_s60.png differ -- cgit v0.12 From ef7260c41b3ffac6459af04c144c521b110527a0 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Tue, 16 Jun 2009 11:42:05 +0200 Subject: doc: document QScopedPointer with forward declared classes Also some small doc cleanups --- .../code/src_corelib_tools_qscopedpointer.cpp | 20 +++++++++++++++++++- src/corelib/tools/qscopedpointer.cpp | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp index 05377dd..7de42b7 100644 --- a/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp @@ -3,7 +3,6 @@ void myFunction(bool useSubClass) { MyClass *p = useSubClass ? new MyClass() : new MySubClass; QIODevice *device = handsOverOwnership(); - QIODevi if (m_value > 3) { delete p; @@ -62,3 +61,22 @@ if (scopedPointer) { ... } //! [3] + +//! [4] +class MyPrivateClass; // forward declare MyPrivateClass + +class MyClass +{ +private: + QScopedPointer privatePtr; // QScopedPointer to forward declared class + +public: + MyClass(); // OK + inline ~MyClass() {} // VIOLATION - Destructor must not be inline + +private: + Q_DISABLE_COPY(MyClass) // OK - copy constructor and assignment operators + // are now disabled, so the compiler won't implicitely + // generate them. +}; +//! [4] diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index 6a1ffb6..912edb6 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -80,6 +80,21 @@ \note QScopedPointer does not work with arrays. + \section1 Forward Declared Pointers + + Classes that are forward declared can be used within QScopedPointer, as + long as the destructor of the forward declared class is available whenever + a QScopedPointer needs to clean up. + + Concretely, this means that all classes containing a QScopedPointer that + points to a forward declared class must have non-inline constructors, + destructors and assignment operators: + + \snippet doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp 4 + + Otherwise, the compiler output a warning about not being able to destruct + \c MyPrivateClass. + \sa QSharedPointer */ @@ -142,7 +157,7 @@ /*! - \fn bool QScopedPointer::operator!=(const QScopedPointer *other) const + \fn bool QScopedPointer::operator!=(const QScopedPointer &other) const Inequality operator. Returns true if the scoped pointer \a other is not pointing to the same object as this pointer, otherwise returns false. -- cgit v0.12 From ba0ad632b7058b2dc8b780d0e713a5f577a1bb3b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 16 Jun 2009 12:24:01 +0200 Subject: Fix for Task #256159 --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index 7d79422..9e70cff 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -74,8 +74,6 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent) m_fepState->SetFlags(EAknEditorFlagDefault); m_fepState->SetDefaultInputMode( EAknEditorTextInputMode ); m_fepState->SetPermittedInputModes( EAknEditorAllInputModes ); - m_fepState->SetLocalLanguage(ELangEnglish); - m_fepState->SetDefaultLanguage(ELangEnglish); m_fepState->SetDefaultCase( EAknEditorLowerCase ); m_fepState->SetPermittedCases( EAknEditorLowerCase|EAknEditorUpperCase ); m_fepState->SetSpecialCharacterTableResourceId( 0 ); -- cgit v0.12 From 422f908b5452c39c935f92fe05652211ef2466d3 Mon Sep 17 00:00:00 2001 From: mread Date: Tue, 16 Jun 2009 12:19:36 +0100 Subject: getting ftp to build in RnD environments --- examples/network/ftp/ftp.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro index 0fb9934..634c43c 100644 --- a/examples/network/ftp/ftp.pro +++ b/examples/network/ftp/ftp.pro @@ -13,6 +13,7 @@ INSTALLS += target sources include($$QT_SOURCE_TREE/examples/examplebase.pri) symbian { + INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.CAPABILITY="NetworkServices" TARGET.UID3 = 0xA000A648 LIBS+=-lesock -lconnmon # For IAP selection -- cgit v0.12