diff options
68 files changed, 73 insertions, 1614 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index eaa48cd901..cfa7923128 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -18,12 +18,3 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target -symbian:{ - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir - importFiles.path = ImageProviderCore - DEPLOYMENT += importFiles -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 03f7294131..bdcb62ca8a 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -23,8 +23,3 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target -symbian { - CONFIG += qt_example - TARGET.EPOCALLOWDLLDATA = 1 -} -maemo5: CONFIG += qt_example diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index d3683fe376..883c0afe2d 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -9,9 +9,6 @@ SUBDIRS = \ tutorials \ script -# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name -symbian:SUBDIRS -= plugins - # These examples contain no C++ and can simply be copied sources.files = \ animation \ diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro index 5d7b9df074..3b9e4e0f62 100644 --- a/examples/declarative/painteditem/smile/smile.pro +++ b/examples/declarative/painteditem/smile/smile.pro @@ -9,6 +9,3 @@ SOURCES += main.cpp CONFIG += console -symbian { - TARGET.EPOCHEAPSIZE = 0x20000 0x5000000 -} diff --git a/examples/declarative/script/shell/shell.pro b/examples/declarative/script/shell/shell.pro index 7ddc06b3c4..00191ab3d0 100644 --- a/examples/declarative/script/shell/shell.pro +++ b/examples/declarative/script/shell/shell.pro @@ -2,7 +2,6 @@ QT += declarative win32: CONFIG += console mac:CONFIG -= app_bundle -symbian: CONFIG += qt_example SOURCES += main.cpp diff --git a/examples/embedded/qmlcalculator/deployment.pri b/examples/embedded/qmlcalculator/deployment.pri index a97498e91f..a3627b8fa2 100644 --- a/examples/embedded/qmlcalculator/deployment.pri +++ b/examples/embedded/qmlcalculator/deployment.pri @@ -1,8 +1,4 @@ qmlcalculator_src = $$PWD/../../declarative/calculator -symbian { - load(data_caging_paths) - qmlcalculator_uid3 = A000E3FB - qmlcalculator_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlcalculator_uid3 -} + qmlcalculator_files.files = $$qmlcalculator_src/calculator.qml $$qmlcalculator_src/Core DEPLOYMENT += qmlcalculator_files diff --git a/examples/embedded/qmlcalculator/qmlcalculator.cpp b/examples/embedded/qmlcalculator/qmlcalculator.cpp index bed579726c..94cb00f4a2 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.cpp +++ b/examples/embedded/qmlcalculator/qmlcalculator.cpp @@ -44,13 +44,6 @@ #include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeEngine> -#if defined(Q_OS_SYMBIAN) -#include <eikenv.h> -#include <eikappui.h> -#include <aknenv.h> -#include <aknappui.h> -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { QApplication application(argc, argv); @@ -60,21 +53,11 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - + #if defined(QT_KEYPAD_NAVIGATION) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlcalculator/qmlcalculator.pro b/examples/embedded/qmlcalculator/qmlcalculator.pro index 72f45f56d1..25c16ca78a 100644 --- a/examples/embedded/qmlcalculator/qmlcalculator.pro +++ b/examples/embedded/qmlcalculator/qmlcalculator.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmlcalculator.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} diff --git a/examples/embedded/qmlclocks/deployment.pri b/examples/embedded/qmlclocks/deployment.pri index 6c6704ccc7..771a4dba76 100644 --- a/examples/embedded/qmlclocks/deployment.pri +++ b/examples/embedded/qmlclocks/deployment.pri @@ -1,8 +1,4 @@ qmlclocks_src = $$PWD/../../../examples/declarative/toys/clocks -symbian { - load(data_caging_paths) - qmlclocks_uid3 = A000E3FC - qmlclocks_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlclocks_uid3 -} + qmlclocks_files.files = $$qmlclocks_src/clocks.qml $$qmlclocks_src/content DEPLOYMENT += qmlclocks_files diff --git a/examples/embedded/qmlclocks/qmlclocks.cpp b/examples/embedded/qmlclocks/qmlclocks.cpp index 75d0be0874..04366aa0ab 100644 --- a/examples/embedded/qmlclocks/qmlclocks.cpp +++ b/examples/embedded/qmlclocks/qmlclocks.cpp @@ -44,13 +44,6 @@ #include <QtDeclarative/QDeclarativeView> #include <QtDeclarative/QDeclarativeEngine> -#if defined(Q_OS_SYMBIAN) -#include <eikenv.h> -#include <eikappui.h> -#include <aknenv.h> -#include <aknappui.h> -#endif // Q_OS_SYMBIAN - int main(int argc, char *argv[]) { QApplication application(argc, argv); @@ -65,16 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - CAknAppUi* appUi = dynamic_cast<CAknAppUi*> (CEikonEnv::Static()->AppUi()); - TRAPD(error, - if (appUi) - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape) - ) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmlclocks/qmlclocks.pro b/examples/embedded/qmlclocks/qmlclocks.pro index 1b6cdad6be..8e9dcdf87c 100644 --- a/examples/embedded/qmlclocks/qmlclocks.pro +++ b/examples/embedded/qmlclocks/qmlclocks.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmlclocks.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lcone -leikcore -lavkon # Screen orientation -} diff --git a/examples/embedded/qmldialcontrol/deployment.pri b/examples/embedded/qmldialcontrol/deployment.pri index a9784439a4..d845120923 100644 --- a/examples/embedded/qmldialcontrol/deployment.pri +++ b/examples/embedded/qmldialcontrol/deployment.pri @@ -1,8 +1,4 @@ qmldialcontrol_src = $$PWD/../../../examples/declarative/ui-components/dialcontrol -symbian { - load(data_caging_paths) - qmldialcontrol_uid3 = A000E3FD - qmldialcontrol_files.path = $$APP_PRIVATE_DIR_BASE/$$qmldialcontrol_uid3 -} + qmldialcontrol_files.files = $$qmldialcontrol_src/dialcontrol.qml $$qmldialcontrol_src/content DEPLOYMENT += qmldialcontrol_files diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp index 7cc4ed6668..6f9b0e574a 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.cpp +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmldialcontrol/qmldialcontrol.pro b/examples/embedded/qmldialcontrol/qmldialcontrol.pro index 3b2e88649e..08f876b926 100644 --- a/examples/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/examples/embedded/qmldialcontrol/qmldialcontrol.pro @@ -1,11 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmldialcontrol.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmleasing/deployment.pri b/examples/embedded/qmleasing/deployment.pri index 946fcd9d89..7a5d0401cb 100644 --- a/examples/embedded/qmleasing/deployment.pri +++ b/examples/embedded/qmleasing/deployment.pri @@ -1,8 +1,4 @@ qmleasing_src = $$PWD/../../../examples/declarative/animation/easing -symbian { - load(data_caging_paths) - qmleasing_uid3 = A000E3FE - qmleasing_files.path = $$APP_PRIVATE_DIR_BASE/$$qmleasing_uid3 -} + qmleasing_files.files = $$qmleasing_src/easing.qml $$qmleasing_src/content DEPLOYMENT += qmleasing_files diff --git a/examples/embedded/qmleasing/qmleasing.cpp b/examples/embedded/qmleasing/qmleasing.cpp index 38c457d376..3e24546b4a 100644 --- a/examples/embedded/qmleasing/qmleasing.cpp +++ b/examples/embedded/qmleasing/qmleasing.cpp @@ -58,11 +58,6 @@ int main(int argc, char *argv[]) QApplication::setNavigationMode(Qt::NavigationModeCursorAuto); #endif // QT_KEYPAD_NAVIGATION -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.show(); -#endif // Q_OS_SYMBIAN - return application.exec(); } diff --git a/examples/embedded/qmleasing/qmleasing.pro b/examples/embedded/qmleasing/qmleasing.pro index bf332aa07d..c9f008d42e 100644 --- a/examples/embedded/qmleasing/qmleasing.pro +++ b/examples/embedded/qmleasing/qmleasing.pro @@ -1,11 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative SOURCES += $$PWD/qmleasing.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmlflickr/deployment.pri b/examples/embedded/qmlflickr/deployment.pri index a38dc95f8c..0d76ddc1db 100644 --- a/examples/embedded/qmlflickr/deployment.pri +++ b/examples/embedded/qmlflickr/deployment.pri @@ -1,8 +1,4 @@ qmlflickr_src = $$PWD/../../declarative/flickr -symbian { - load(data_caging_paths) - qmlflickr_uid3 = A000E3FF - qmlflickr_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlflickr_uid3 -} + qmlflickr_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile DEPLOYMENT += qmlflickr_files diff --git a/examples/embedded/qmlflickr/qmlflickr.cpp b/examples/embedded/qmlflickr/qmlflickr.cpp index 052d11c48a..dc7b5ee397 100644 --- a/examples/embedded/qmlflickr/qmlflickr.cpp +++ b/examples/embedded/qmlflickr/qmlflickr.cpp @@ -97,13 +97,8 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmlflickr/qmlflickr.pro b/examples/embedded/qmlflickr/qmlflickr.pro index 60abe31333..869d651b05 100644 --- a/examples/embedded/qmlflickr/qmlflickr.pro +++ b/examples/embedded/qmlflickr/qmlflickr.pro @@ -1,13 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmlflickr.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - # Maximum heap size set to 128 MB in order to allow loading large images. - TARGET.EPOCHEAPSIZE = 0x20000 0x8000000 -} diff --git a/examples/embedded/qmlphotoviewer/deployment.pri b/examples/embedded/qmlphotoviewer/deployment.pri index 23882e3686..504373914a 100644 --- a/examples/embedded/qmlphotoviewer/deployment.pri +++ b/examples/embedded/qmlphotoviewer/deployment.pri @@ -1,8 +1,4 @@ qmlphotoviewer_src = $$PWD/../../declarative/photoviewer -symbian { - load(data_caging_paths) - qmlphotoviewer_uid3 = A000E400 - qmlphotoviewer_files.path = $$APP_PRIVATE_DIR_BASE/$$qmlphotoviewer_uid3 -} + qmlphotoviewer_files.files = $$qmlphotoviewer_src/photoviewer.qml $$qmlphotoviewer_src/PhotoViewerCore DEPLOYMENT += qmlphotoviewer_files diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp index 89a0902373..16135a7851 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.cpp @@ -97,13 +97,8 @@ int main(int argc, char *argv[]) view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro index b97bf269d3..9941b2e226 100644 --- a/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/examples/embedded/qmlphotoviewer/qmlphotoviewer.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmlphotoviewer.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/examples/embedded/qmltwitter/deployment.pri b/examples/embedded/qmltwitter/deployment.pri index 3edc0e527c..a3c045ca54 100644 --- a/examples/embedded/qmltwitter/deployment.pri +++ b/examples/embedded/qmltwitter/deployment.pri @@ -1,8 +1,4 @@ qmltwitter_src = $$PWD/../../declarative/twitter -symbian { - load(data_caging_paths) - qmltwitter_uid3 = A000E401 - qmltwitter_files.path = $$APP_PRIVATE_DIR_BASE/$$qmltwitter_uid3 -} + qmltwitter_files.files = $$qmltwitter_src/twitter.qml $$qmltwitter_src/TwitterCore DEPLOYMENT += qmltwitter_files diff --git a/examples/embedded/qmltwitter/qmltwitter.cpp b/examples/embedded/qmltwitter/qmltwitter.cpp index f63f9055ef..5485028aff 100644 --- a/examples/embedded/qmltwitter/qmltwitter.cpp +++ b/examples/embedded/qmltwitter/qmltwitter.cpp @@ -96,13 +96,8 @@ int main(int argc, char *argv[]) view.setSource(QUrl(mainQmlApp)); view.setResizeMode(QDeclarativeView::SizeRootObjectToView); QObject::connect(view.engine(), SIGNAL(quit()), &application, SLOT(quit())); - -#if defined(Q_OS_SYMBIAN) - view.showFullScreen(); -#else // Q_OS_SYMBIAN view.setGeometry(QRect(100, 100, 360, 640)); view.show(); -#endif // Q_OS_SYMBIAN return application.exec(); } diff --git a/examples/embedded/qmltwitter/qmltwitter.pro b/examples/embedded/qmltwitter/qmltwitter.pro index 79e25de287..ce40cd7489 100644 --- a/examples/embedded/qmltwitter/qmltwitter.pro +++ b/examples/embedded/qmltwitter/qmltwitter.pro @@ -1,12 +1,5 @@ -!symbian:!wince*:warning("DEPLOYMENT support required. This project only works on Symbian and WinCE.") +!wince*:warning("DEPLOYMENT support required. This project only works on WinCE.") QT += declarative network SOURCES += $$PWD/qmltwitter.cpp include($$PWD/deployment.pri) - -symbian { - TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 3cf0d39d58..60b5648f03 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -35,18 +35,6 @@ include(items/items.pri) include(particles/particles.pri) include(designer/designer.pri) -symbian: { - TARGET.UID3=0x2001E623 - LIBS += -lefsrv - - contains(QT_CONFIG, freetype) { - DEFINES += QT_NO_FONTCONFIG - INCLUDEPATH += \ - ../3rdparty/freetype/src \ - ../3rdparty/freetype/include - } -} - linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND DEFINES += QT_NO_OPENTYPE diff --git a/src/declarative/items/qquicktext.cpp b/src/declarative/items/qquicktext.cpp index bf736e6a10..36d15c6a64 100644 --- a/src/declarative/items/qquicktext.cpp +++ b/src/declarative/items/qquicktext.cpp @@ -683,14 +683,14 @@ QPixmap QQuickTextPrivate::textLayoutImage(bool drawStyle) QPixmap img(size); if (!size.isEmpty()) { img.fill(Qt::transparent); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC // Fails on CocoaX64 bool oldSmooth = qt_applefontsmoothing_enabled; qt_applefontsmoothing_enabled = false; -#endif +#endif*/ QPainter p(&img); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC // Fails on CocoaX64 qt_applefontsmoothing_enabled = oldSmooth; -#endif +#endif*/ drawTextLayout(&p, QPointF(-layedOutTextRect.x(),0), drawStyle); } return img; @@ -723,14 +723,14 @@ QPixmap QQuickTextPrivate::textDocumentImage(bool drawStyle) //paint text QPixmap img(size); img.fill(Qt::transparent); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC // Fails on CocoaX64 bool oldSmooth = qt_applefontsmoothing_enabled; qt_applefontsmoothing_enabled = false; -#endif +#endif*/ QPainter p(&img); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC // Fails on CocoaX64 qt_applefontsmoothing_enabled = oldSmooth; -#endif +#endif*/ QAbstractTextDocumentLayout::PaintContext context; diff --git a/src/declarative/items/qquicktextedit.cpp b/src/declarative/items/qquicktextedit.cpp index 75f60bc08c..f132c70400 100644 --- a/src/declarative/items/qquicktextedit.cpp +++ b/src/declarative/items/qquicktextedit.cpp @@ -1490,7 +1490,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * } else if (oldNode == 0 || d->documentDirty) { d->documentDirty = false; -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) // Make sure document is relayouted in the paint node on Mac // to avoid crashes due to the font engines created in the // shaping process @@ -1519,7 +1519,7 @@ QSGNode *QQuickTextEdit::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData * selectionEnd() - 1); // selectionEnd() returns first char after // selection -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) // We also need to make sure the document layout is redone when // control is returned to the main thread, as all the font engines // are now owned by the rendering thread @@ -1873,9 +1873,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption() customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms - the panels are automatically opened when TextEdit element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. You can disable the automatic behavior by setting the property \c activeFocusOnPress to false @@ -1918,9 +1916,7 @@ void QQuickTextEdit::openSoftwareInputPanel() for customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextEdit. On other platforms - the panels are automatically opened when TextEdit element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. You can disable the automatic behavior by setting the property \c activeFocusOnPress to false diff --git a/src/declarative/items/qquicktextinput.cpp b/src/declarative/items/qquicktextinput.cpp index e28832ed4e..4e260560a1 100644 --- a/src/declarative/items/qquicktextinput.cpp +++ b/src/declarative/items/qquicktextinput.cpp @@ -1699,12 +1699,10 @@ void QQuickTextInput::moveCursorSelection(int pos, SelectionMode mode) customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextInput. On other platforms - the panels are automatically opened when TextInput element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. - . You can disable the automatic behavior by setting the property \c activeFocusOnPress to false + You can disable the automatic behavior by setting the property \c activeFocusOnPress to false and use functions openSoftwareInputPanel() and closeSoftwareInputPanel() to implement the behavior you want. @@ -1744,12 +1742,10 @@ void QQuickTextInput::openSoftwareInputPanel() for customizing when you want the input keyboard to be shown and hidden in your application. - By default the opening of input panels follows the platform style. On Symbian^1 and - Symbian^3 -based devices the panels are opened by clicking TextInput. On other platforms - the panels are automatically opened when TextInput element gains active focus. Input panels are + By default the opening of input panels follows the platform style. Input panels are always closed if no editor has active focus. - . You can disable the automatic behavior by setting the property \c activeFocusOnPress to false + You can disable the automatic behavior by setting the property \c activeFocusOnPress to false and use functions openSoftwareInputPanel() and closeSoftwareInputPanel() to implement the behavior you want. @@ -1826,9 +1822,6 @@ bool QQuickTextInput::isInputMethodComposing() const void QQuickTextInputPrivate::init() { Q_Q(QQuickTextInput); -#if defined(Q_WS_MAC) - control->setThreadChecks(true); -#endif control->setParent(q);//Now mandatory due to accessibility changes control->setCursorWidth(1); control->setPasswordCharacter(QLatin1Char('*')); diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h index cc0a4b6b1d..c6caa1e354 100644 --- a/src/declarative/qml/qdeclarativeglobal_p.h +++ b/src/declarative/qml/qdeclarativeglobal_p.h @@ -90,11 +90,7 @@ QT_MODULE(Declarative) QMetaObject::connect(sender, signalIdx, receiver, methodIdx, Qt::DirectConnection); \ } -#ifdef Q_OS_SYMBIAN -#define Q_DECLARATIVE_PRIVATE_EXPORT Q_AUTOTEST_EXPORT -#else #define Q_DECLARATIVE_PRIVATE_EXPORT Q_DECLARATIVE_EXPORT -#endif struct QDeclarativeGraphics_DerivedObject : public QObject { diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index f94e9e4bae..0a03443acc 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -51,10 +51,6 @@ #include <private/qdeclarativetypenamecache_p.h> #include <private/qdeclarativeengine_p.h> -#ifdef Q_OS_SYMBIAN -#include <private/qcore_symbian_p.h> -#endif - QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) @@ -382,13 +378,6 @@ bool QDeclarativeImportsPrivate::importExtension(const QString &absoluteFilePath foreach (const QDeclarativeDirParser::Plugin &plugin, qmldirParser->plugins()) { QString resolvedFilePath = database->resolvePlugin(typeLoader, qmldirPath, plugin.path, plugin.name); -#if defined(QT_LIBINFIX) && defined(Q_OS_SYMBIAN) - if (resolvedFilePath.isEmpty()) { - // In case of libinfixed build, attempt to load libinfixed version, too. - QString infixedPluginName = plugin.name + QLatin1String(QT_LIBINFIX); - resolvedFilePath = database->resolvePlugin(dir, plugin.path, infixedPluginName); - } -#endif if (!resolvedFilePath.isEmpty()) { if (!database->importPlugin(resolvedFilePath, uri, errors)) { if (errors) { @@ -751,38 +740,13 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e) #ifndef QT_NO_SETTINGS QString installImportsPath = QLibraryInfo::location(QLibraryInfo::ImportsPath); - -#if defined(Q_OS_SYMBIAN) - // Append imports path for all available drives in Symbian - if (installImportsPath.at(1) != QChar(QLatin1Char(':'))) { - QString tempPath = installImportsPath; - if (tempPath.at(tempPath.length() - 1) != QDir::separator()) { - tempPath += QDir::separator(); - } - RFs& fs = qt_s60GetRFs(); - TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData())); - TFindFile finder(fs); - TInt err = finder.FindByDir(tempPathPtr, tempPathPtr); - while (err == KErrNone) { - QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()), - finder.File().Length()); - foundDir = QDir(foundDir).canonicalPath(); - addImportPath(foundDir); - err = finder.Find(); - } - } else { - addImportPath(installImportsPath); - } -#else addImportPath(installImportsPath); -#endif - #endif // QT_NO_SETTINGS // env import paths QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); if (!envImportPath.isEmpty()) { -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) QLatin1Char pathSep(';'); #else QLatin1Char pathSep(':'); @@ -899,7 +863,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(QDeclarativeTypeLoader *typeLo \row \i AIX \i \c .a \row \i HP-UX \i \c .sl, \c .so (HP-UXi) \row \i Mac OS X \i \c .dylib, \c .bundle, \c .so - \row \i Symbian \i \c .dll \endtable Version number on unix are ignored. @@ -915,11 +878,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(QDeclarativeTypeLoader *typeLo << QLatin1String("d.dll") // try a qmake-style debug build first # endif << QLatin1String(".dll")); -#elif defined(Q_OS_SYMBIAN) - return resolvePlugin(typeLoader, qmldirPath, qmldirPluginPath, baseName, - QStringList() - << QLatin1String(".dll") - << QLatin1String(".qtplugin")); #else # if defined(Q_OS_DARWIN) diff --git a/src/declarative/scenegraph/qsgcontext.cpp b/src/declarative/scenegraph/qsgcontext.cpp index 466ae5919e..f995f9e76e 100644 --- a/src/declarative/scenegraph/qsgcontext.cpp +++ b/src/declarative/scenegraph/qsgcontext.cpp @@ -413,7 +413,7 @@ QSGTexture *QSGContext::createTexture(const QImage &image) const QSize QSGContext::minimumFBOSize() const { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC return QSize(33, 33); #else return QSize(1, 1); diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 63f75d9254..26efc654b8 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -13,14 +13,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -symbian:{ - TARGET.UID3 = 0x20021320 - - isEmpty(DESTDIR):importFiles.files = qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir - else:importFiles.files = $$DESTDIR/qmlfolderlistmodelplugin$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - - DEPLOYMENT = importFiles -} - INSTALLS += target qmldir diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index 88675d4ae0..a6c9f97a96 100644 --- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -269,7 +269,7 @@ QUrl QDeclarativeFolderListModel::parentFolder() const QString localFile = d->folder.toLocalFile(); if (!localFile.isEmpty()) { QDir dir(localFile); -#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) +#if defined(Q_OS_WIN) if (dir.isRoot()) dir.setPath(""); else diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index e7095956b2..36244a1d71 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -13,14 +13,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -symbian:{ - TARGET.UID3 = 0x2002131F - - isEmpty(DESTDIR):importFiles.files = qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir - else:importFiles.files = $$DESTDIR/qmlgesturesplugin$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - - DEPLOYMENT = importFiles -} - INSTALLS += target qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 74dab8dcf3..3c523aca4a 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -20,14 +20,4 @@ target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -symbian:{ - TARGET.UID3 = 0x2002131E - - isEmpty(DESTDIR):importFiles.files = qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir - else:importFiles.files = $$DESTDIR/qmlparticlesplugin$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - - DEPLOYMENT = importFiles -} - INSTALLS += target qmldir diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 5807425e3c..110d145e94 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -1,6 +1,5 @@ load(qt_module) -symbian:load(qt_plugin) TEMPLATE = lib CONFIG += qt plugin @@ -30,9 +29,3 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols load(qt_targets) wince*:LIBS += $$QMAKE_LIBS_GUI - -symbian: { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - load(armcc_warnings) -} diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro index da072d34b1..dbe45fb6fa 100644 --- a/src/imports/testlib/testlib.pro +++ b/src/imports/testlib/testlib.pro @@ -2,25 +2,8 @@ TARGET = qmltestplugin TARGETPATH = QtTest include(../qimportbase.pri) - CONFIG += qt plugin -symbian { - CONFIG += epocallowdlldata - contains(QT_EDITION, OpenSource) { - TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData - } else { - TARGET.CAPABILITY = All -Tcb - } - - isEmpty(DESTDIR):importFiles.files = qmltestplugin$${QT_LIBINFIX}.dll qmldir - else:importFiles.files = $$DESTDIR/qmltestplugin$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - - DEPLOYMENT = importFiles - -} - QT += declarative qmltest qmltest-private v8-private declarative-private core-private testlib SOURCES += main.cpp diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 9d2b67cfb6..0c870bbf2d 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -55,5 +55,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp index cf456ff251..92f34b36e8 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/qtquick1/zoomtool.cpp @@ -151,7 +151,7 @@ void ZoomTool::mouseReleaseEvent(QMouseEvent *event) view()->setSceneRect(sceneArea); } else { Qt::KeyboardModifier modifierKey = Qt::ControlModifier; -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC modifierKey = Qt::AltModifier; #endif if (event->modifiers() & modifierKey) { diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro index a12fac5da3..c1ca2a5ef9 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro +++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro @@ -8,7 +8,7 @@ QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" SOURCES += \ qmlostplugin.cpp \ - qostdevice.cpp + qostdevice.cpp HEADERS += \ qmlostplugin.h \ @@ -17,5 +17,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E92 diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index c5f8f90cd6..8ab507c055 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -16,5 +16,3 @@ HEADERS += \ target.path += $$[QT_INSTALL_PLUGINS]/qmltooling INSTALLS += target - -symbian:TARGET.UID3=0x20031E90 diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index b5c8eaf487..5b735cb716 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,7 +1,4 @@ TEMPLATE = subdirs SUBDIRS = qmldbg_tcp - SUBDIRS += qmldbg_inspector - -symbian:SUBDIRS += qmldbg_ost diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro index b0b64cdc6b..ff04487b18 100644 --- a/src/qmltest/qmltest.pro +++ b/src/qmltest/qmltest.pro @@ -19,16 +19,6 @@ feature.path = $$[QT_INSTALL_DATA]/mkspecs/features feature.files = $$PWD/features/qmltestcase.prf INSTALLS += feature -symbian { - DEFINES += QT_MAKEDLL - CONFIG += epocallowdlldata - contains(QT_EDITION, OpenSource) { - TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData - } else { - TARGET.CAPABILITY = All -Tcb - } -} - INCLUDEPATH += $$PWD/QtQuickTest INCLUDEPATH += $$PWD diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h index 389674c1b5..54a77a64c9 100644 --- a/src/qmltest/quicktestglobal.h +++ b/src/qmltest/quicktestglobal.h @@ -47,7 +47,7 @@ QT_BEGIN_HEADER QT_LICENSED_MODULE(QtQuickTest) -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) # if defined(QT_NODLL) # undef QT_MAKEDLL # undef QT_DLL diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index db345e38fd..72313ab054 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -67,8 +67,6 @@ tst_qdeclarativeapplication::tst_qdeclarativeapplication() void tst_qdeclarativeapplication::active() { - QSKIP("QTBUG-21573"); - QDeclarativeComponent component(&engine); component.setData("import QtQuick 2.0; Item { property bool active: Qt.application.active }", QUrl::fromLocalFile("")); QQuickItem *item = qobject_cast<QQuickItem *>(component.create()); @@ -84,23 +82,28 @@ void tst_qdeclarativeapplication::active() view.show(); view.requestActivateWindow(); QTest::qWait(50); + QEXPECT_FAIL("", "QTBUG-21573", Abort); QTRY_COMPARE(view.status(), QQuickView::Ready); QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0); - // not active again +#if 0 + // QGuiApplication has no equivalent of setActiveWindow(0). QTBUG-21573 + // Is this different to clearing the active state of the window or can it be removed? + // On Mac, setActiveWindow(0) on mac does not deactivate the current application, + // must switch to a different app or hide the current app to trigger this // on mac, setActiveWindow(0) on mac does not deactivate the current application // (you have to switch to a different app or hide the current app to trigger this) -#if !defined(Q_WS_MAC) -// QTBUG-21573 -// QGuiApplication::setActiveWindow(0); + + // not active again + QGuiApplication::setActiveWindow(0); QVERIFY(!item->property("active").toBool()); QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0); #endif + } void tst_qdeclarativeapplication::layoutDirection() { - QSKIP("QTBUG-21573"); QDeclarativeComponent component(&engine); component.setData("import QtQuick 2.0; Item { property bool layoutDirection: Qt.application.layoutDirection }", QUrl::fromLocalFile("")); @@ -114,6 +117,7 @@ void tst_qdeclarativeapplication::layoutDirection() // mirrored QGuiApplication::setLayoutDirection(Qt::RightToLeft); + QEXPECT_FAIL("", "QTBUG-21573", Abort); QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::RightToLeft); // not mirrored again diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index f83a1b3efd..35b4fe4ce7 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -929,13 +929,11 @@ void tst_QJSEngine::jsParseDate() } // Date.parse() should be able to parse the output of Date().toString() -#ifndef Q_WS_WIN // TODO: Test and remove this since 169701 has been fixed { QJSValue ret = eng.evaluate("var x = new Date(); var s = x.toString(); s == new Date(Date.parse(s)).toString()"); QVERIFY(ret.isBoolean()); QCOMPARE(ret.toBoolean(), true); } -#endif } void tst_QJSEngine::newQObject() @@ -1073,7 +1071,7 @@ void tst_QJSEngine::newQObject_promoteObject() void tst_QJSEngine::newQObject_sameQObject() { #if 0 // ###FIXME: No QObjectWrapOptions API - QSKIP("This test stongly relay on strictlyEquals feature that would change in near future"); + QSKIP("This test strongly relies on strictlyEquals feature that would change in near future"); QScriptEngine eng; // calling newQObject() several times with same object for (int x = 0; x < 2; ++x) { diff --git a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp b/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp index 2f155e298e..a02db06616 100644 --- a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp @@ -533,7 +533,7 @@ void tst_qquickflickable::disabled() void tst_qquickflickable::flickVelocity() { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QSKIP("Producing flicks on Mac CI impossible due to timing problems"); #endif diff --git a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp b/tests/auto/declarative/qquickitem/tst_qquickitem.cpp index 35346c8236..a5f908ce86 100644 --- a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/declarative/qquickitem/tst_qquickitem.cpp @@ -137,11 +137,6 @@ private: w->show(); w->requestActivateWindow(); qApp->processEvents(); - -#ifdef Q_WS_X11 - // to be safe and avoid failing setFocus with window managers - qt_x11_wait_for_window_manager(w); -#endif } }; diff --git a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp b/tests/auto/declarative/qquicktext/tst_qquicktext.cpp index 3a08dd208d..8ac3a078bc 100644 --- a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/declarative/qquicktext/tst_qquicktext.cpp @@ -520,15 +520,7 @@ void tst_qquicktext::alignments() QFETCH(int, vAlign); QFETCH(QString, expectfile); -#ifdef Q_WS_X11 - // Font-specific, but not likely platform-specific, so only test on one platform - QFont fn; - fn.setRawName("-misc-fixed-medium-r-*-*-8-*-*-*-*-*-*-*"); - QApplication::setFont(fn); -#endif - QQuickView *canvas = createView(TESTDATA("alignments.qml")); - canvas->show(); canvas->requestActivateWindow(); QTest::qWait(50); @@ -545,14 +537,9 @@ void tst_qquicktext::alignments() canvas->render(&p); QImage expect(expectfile); - -#ifdef Q_WS_X11 - // Font-specific, but not likely platform-specific, so only test on one platform if (QApplicationPrivate::graphics_system_name == "raster" || QApplicationPrivate::graphics_system_name == "") { QCOMPARE(actual,expect); } -#endif - delete canvas; #endif } diff --git a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp index 86c33a64d8..bcc1a4c5d7 100644 --- a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp @@ -63,7 +63,7 @@ #include <private/qtextcontrol_p.h> #include "../shared/util.h" -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC #include <Carbon/Carbon.h> #endif @@ -1780,7 +1780,7 @@ void tst_qquicktextedit::navigation() void tst_qquicktextedit::copyAndPaste() { #ifndef QT_NO_CLIPBOARD -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC { PasteboardRef pasteboard; OSStatus status = PasteboardCreate(0, &pasteboard); @@ -2207,9 +2207,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, 0); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, false); // The cursor position hasn't changed. -#endif QCOMPARE(cursorRectangleSpy.count(), 0); // Verify that the micro focus rect moves to the left as the cursor position @@ -2219,9 +2217,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, i); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QVERIFY(previousRect.left() < currentRect.left()); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); -#endif QVERIFY(cursorRectangleSpy.count() > 0); cursorRectangleSpy.clear(); previousRect = currentRect; @@ -2234,9 +2230,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>())); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); -#endif QVERIFY(cursorRectangleSpy.count() > 0); #endif } diff --git a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp index 23224d0452..7e381480cf 100644 --- a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp @@ -1164,9 +1164,11 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft() { QInputMethodEvent ev("Hello world!", QList<QInputMethodEvent::Attribute>()); QGuiApplication::sendEvent(&canvas, &ev); } QCOMPARE(textInput->hAlign(), QQuickTextInput::AlignLeft); -#ifndef Q_OS_MAC // QTBUG-18040 +#ifdef Q_OS_MAC // empty text with implicit alignment follows the system locale-based // keyboard input direction from QGuiApplication::keyboardInputDirection + QEXPECT_FAIL("", "QTBUG-18040", Abort); +#endif textInput->setText(""); QCOMPARE(textInput->hAlign(), QGuiApplication::keyboardInputDirection() == Qt::LeftToRight ? QQuickTextInput::AlignLeft : QQuickTextInput::AlignRight); @@ -1177,10 +1179,11 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft() textInput->setHAlign(QQuickTextInput::AlignRight); QCOMPARE(textInput->hAlign(), QQuickTextInput::AlignRight); QVERIFY(-textInputPrivate->hscroll > canvas.width()/2); -#endif -#ifndef Q_OS_MAC // QTBUG-18040 - // alignment of TextInput with no text set to it + +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-18040", Abort); // alignment of TextInput with no text set to it +#endif QString componentStr = "import QtQuick 2.0\nTextInput {}"; QDeclarativeComponent textComponent(&engine); textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); @@ -1188,7 +1191,6 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft() QCOMPARE(textObject->hAlign(), QGuiApplication::keyboardInputDirection() == Qt::LeftToRight ? QQuickTextInput::AlignLeft : QQuickTextInput::AlignRight); delete textObject; -#endif } void tst_qquicktextinput::positionAt() @@ -1602,7 +1604,7 @@ void tst_qquicktextinput::navigation_RTL() void tst_qquicktextinput::copyAndPaste() { #ifndef QT_NO_CLIPBOARD -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC { PasteboardRef pasteboard; OSStatus status = PasteboardCreate(0, &pasteboard); @@ -2387,9 +2389,7 @@ void tst_qquicktextinput::preeditMicroFocus() ic.sendPreeditText(preeditText, 0); currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); -#endif // Verify that the micro focus rect moves to the left as the cursor position // is incremented. @@ -2398,9 +2398,8 @@ void tst_qquicktextinput::preeditMicroFocus() ic.sendPreeditText(preeditText, i); currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QVERIFY(previousRect.left() < currentRect.left()); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) + QCOMPARE(ic.updateReceived, true); -#endif previousRect = currentRect; } @@ -2411,10 +2410,8 @@ void tst_qquicktextinput::preeditMicroFocus() ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>())); currentRect = input->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); #endif -#endif } void tst_qquicktextinput::inputContextMouseHandler() diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 4706c72eb6..336fc899cd 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -514,7 +514,7 @@ int main(int argc, char ** argv) window->show(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC window->raise(); #endif diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 66c2cda035..d0c4ec7a20 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -13,8 +13,4 @@ SOURCES += main.cpp CONFIG += console declarative_debug -symbian { - TARGET.EPOCHEAPSIZE = 0x20000 0x5000000 -} - DEFINES += QML_RUNTIME_TESTING diff --git a/tools/qmlviewer/deviceorientation_maemo5.cpp b/tools/qmlviewer/deviceorientation_maemo5.cpp deleted file mode 100644 index 59292d93ff..0000000000 --- a/tools/qmlviewer/deviceorientation_maemo5.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "deviceorientation.h" -#include <QtDBus> - -#include <mce/mode-names.h> -#include <mce/dbus-names.h> - -class MaemoOrientation : public DeviceOrientation -{ - Q_OBJECT -public: - MaemoOrientation() - : o(UnknownOrientation), sensorEnabled(false) - { - resumeListening(); - // connect to the orientation change signal - QDBusConnection::systemBus().connect(QString(), MCE_SIGNAL_PATH, MCE_SIGNAL_IF, - MCE_DEVICE_ORIENTATION_SIG, - this, - SLOT(deviceOrientationChanged(QString))); - } - - ~MaemoOrientation() - { - // disable the orientation sensor - QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_ACCELEROMETER_DISABLE_REQ)); - } - - inline Orientation orientation() const - { - return o; - } - - void setOrientation(Orientation o) - { - } - - void pauseListening() { - if (sensorEnabled) { - // disable the orientation sensor - QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_ACCELEROMETER_DISABLE_REQ)); - sensorEnabled = false; - } - } - - void resumeListening() { - if (!sensorEnabled) { - // enable the orientation sensor - QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_ACCELEROMETER_ENABLE_REQ)); - - QDBusMessage reply = QDBusConnection::systemBus().call( - QDBusMessage::createMethodCall(MCE_SERVICE, MCE_REQUEST_PATH, - MCE_REQUEST_IF, MCE_DEVICE_ORIENTATION_GET)); - - if (reply.type() == QDBusMessage::ErrorMessage) { - qWarning("Unable to retrieve device orientation: %s", qPrintable(reply.errorMessage())); - } else { - Orientation orientation = toOrientation(reply.arguments().value(0).toString()); - if (o != orientation) { - o = orientation; - emit orientationChanged(); - } - sensorEnabled = true; - } - } - } - -private Q_SLOTS: - void deviceOrientationChanged(const QString &newOrientation) - { - o = toOrientation(newOrientation); - - emit orientationChanged(); -// printf("%d\n", o); - } - -private: - static Orientation toOrientation(const QString &nativeOrientation) - { - if (nativeOrientation == MCE_ORIENTATION_LANDSCAPE) - return Landscape; - else if (nativeOrientation == MCE_ORIENTATION_LANDSCAPE_INVERTED) - return LandscapeInverted; - else if (nativeOrientation == MCE_ORIENTATION_PORTRAIT) - return Portrait; - else if (nativeOrientation == MCE_ORIENTATION_PORTRAIT_INVERTED) - return PortraitInverted; - return UnknownOrientation; - } - -private: - Orientation o; - bool sensorEnabled; -}; - -DeviceOrientation* DeviceOrientation::instance() -{ - static MaemoOrientation *o = new MaemoOrientation; - return o; -} - -#include "deviceorientation_maemo5.moc" diff --git a/tools/qmlviewer/deviceorientation_symbian.cpp b/tools/qmlviewer/deviceorientation_symbian.cpp deleted file mode 100644 index deeb45dc5a..0000000000 --- a/tools/qmlviewer/deviceorientation_symbian.cpp +++ /dev/null @@ -1,192 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "deviceorientation.h" - -#include <e32base.h> -#include <sensrvchannelfinder.h> -#include <sensrvdatalistener.h> -#include <sensrvchannel.h> -#include <sensrvorientationsensor.h> - -class SymbianOrientation : public DeviceOrientation, public MSensrvDataListener -{ - Q_OBJECT -public: - SymbianOrientation() - : DeviceOrientation(), m_current(UnknownOrientation), m_sensorChannel(0), m_channelOpen(false) - { - TRAP_IGNORE(initL()); - if (!m_sensorChannel) - qWarning("No valid sensors found."); - } - - ~SymbianOrientation() - { - if (m_sensorChannel) { - m_sensorChannel->StopDataListening(); - m_sensorChannel->CloseChannel(); - delete m_sensorChannel; - } - } - - void initL() - { - CSensrvChannelFinder *channelFinder = CSensrvChannelFinder::NewLC(); - RSensrvChannelInfoList channelInfoList; - CleanupClosePushL(channelInfoList); - - TSensrvChannelInfo searchConditions; - searchConditions.iChannelType = KSensrvChannelTypeIdOrientationData; - channelFinder->FindChannelsL(channelInfoList, searchConditions); - - for (int i = 0; i < channelInfoList.Count(); ++i) { - TRAPD(error, m_sensorChannel = CSensrvChannel::NewL(channelInfoList[i])); - if (!error) - TRAP(error, m_sensorChannel->OpenChannelL()); - if (!error) { - TRAP(error, m_sensorChannel->StartDataListeningL(this, 1, 1, 0)); - m_channelOpen = true; - break; - } - if (error) { - delete m_sensorChannel; - m_sensorChannel = 0; - } - } - - channelInfoList.Close(); - CleanupStack::Pop(&channelInfoList); - CleanupStack::PopAndDestroy(channelFinder); - } - - Orientation orientation() const - { - return m_current; - } - - void setOrientation(Orientation) { } - -private: - DeviceOrientation::Orientation m_current; - CSensrvChannel *m_sensorChannel; - bool m_channelOpen; - void pauseListening() { - if (m_sensorChannel && m_channelOpen) { - m_sensorChannel->StopDataListening(); - m_sensorChannel->CloseChannel(); - m_channelOpen = false; - } - } - - void resumeListening() { - if (m_sensorChannel && !m_channelOpen) { - TRAPD(error, m_sensorChannel->OpenChannelL()); - if (!error) { - TRAP(error, m_sensorChannel->StartDataListeningL(this, 1, 1, 0)); - if (!error) { - m_channelOpen = true; - } - } - if (error) { - delete m_sensorChannel; - m_sensorChannel = 0; - } - } - } - - void DataReceived(CSensrvChannel &channel, TInt count, TInt dataLost) - { - Q_UNUSED(dataLost) - if (channel.GetChannelInfo().iChannelType == KSensrvChannelTypeIdOrientationData) { - TSensrvOrientationData data; - for (int i = 0; i < count; ++i) { - TPckgBuf<TSensrvOrientationData> dataBuf; - channel.GetData(dataBuf); - data = dataBuf(); - Orientation orientation = UnknownOrientation; - switch (data.iDeviceOrientation) { - case TSensrvOrientationData::EOrientationDisplayUp: - orientation = Portrait; - break; - case TSensrvOrientationData::EOrientationDisplayRightUp: - orientation = Landscape; - break; - case TSensrvOrientationData::EOrientationDisplayLeftUp: - orientation = LandscapeInverted; - break; - case TSensrvOrientationData::EOrientationDisplayDown: - orientation = PortraitInverted; - break; - case TSensrvOrientationData::EOrientationUndefined: - case TSensrvOrientationData::EOrientationDisplayUpwards: - case TSensrvOrientationData::EOrientationDisplayDownwards: - default: - break; - } - - if (m_current != orientation && orientation != UnknownOrientation) { - m_current = orientation; - emit orientationChanged(); - } - } - } - } - - void DataError(CSensrvChannel& /* channel */, TSensrvErrorSeverity /* error */) - { - } - - void GetDataListenerInterfaceL(TUid /* interfaceUid */, TAny*& /* interface */) - { - } -}; - - -DeviceOrientation* DeviceOrientation::instance() -{ - static SymbianOrientation *o = 0; - if (!o) - o = new SymbianOrientation; - return o; -} - -#include "deviceorientation_symbian.moc" diff --git a/tools/qmlviewer/loggerwidget.cpp b/tools/qmlviewer/loggerwidget.cpp index a82336bfb9..0393299d1f 100644 --- a/tools/qmlviewer/loggerwidget.cpp +++ b/tools/qmlviewer/loggerwidget.cpp @@ -47,11 +47,6 @@ #include <QPlainTextEdit> #include <QLabel> #include <QVBoxLayout> -#ifdef Q_WS_MAEMO_5 -# include <QScrollArea> -# include <QVBoxLayout> -# include "texteditautoresizer_maemo5.h" -#endif #include "loggerwidget.h" @@ -65,31 +60,7 @@ LoggerWidget::LoggerWidget(QWidget *parent) : setWindowTitle(tr("Warnings")); m_plainTextEdit = new QPlainTextEdit(); - -#if defined(Q_OS_SYMBIAN) - QAction* clearAction = new QAction(tr("Clear"), this); - clearAction->setSoftKeyRole(QAction::PositiveSoftKey); - connect(clearAction, SIGNAL(triggered()), m_plainTextEdit, SLOT(clear())); - addAction(clearAction); - - m_plainTextEdit->setReadOnly(true); - QAction* backAction = new QAction( tr("Back"), this ); - backAction->setSoftKeyRole( QAction::NegativeSoftKey ); - connect(backAction, SIGNAL(triggered()), this, SLOT(hide())); - addAction( backAction ); -#endif - -#ifdef Q_WS_MAEMO_5 - new TextEditAutoResizer(m_plainTextEdit); - setAttribute(Qt::WA_Maemo5StackedWindow); - QScrollArea *area = new QScrollArea(); - area->setWidget(m_plainTextEdit); - area->setWidgetResizable(true); - setCentralWidget(area); -#else setCentralWidget(m_plainTextEdit); -#endif - m_noWarningsLabel = new QLabel(m_plainTextEdit); m_noWarningsLabel->setText(tr("(No warnings)")); m_noWarningsLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp index cf33c4e365..91362bb241 100644 --- a/tools/qmlviewer/main.cpp +++ b/tools/qmlviewer/main.cpp @@ -76,13 +76,6 @@ void exitApp(int i) QWeakPointer<LoggerWidget> logger; static QAtomicInt recursiveLock(0); -#if defined (Q_OS_SYMBIAN) -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#endif - void myMessageOutput(QtMsgType type, const char *msg) { QString strMsg = QString::fromLatin1(msg); @@ -98,19 +91,6 @@ void myMessageOutput(QtMsgType type, const char *msg) warnings += QLatin1Char('\n'); } } -#if defined (Q_OS_SYMBIAN) - static int fd = -1; - if (fd == -1) - fd = ::open("E:\\qml.log", O_WRONLY | O_CREAT); - - ::write(fd, msg, strlen(msg)); - ::write(fd, "\n", 1); - ::fsync(fd); - switch (type) { - case QtFatalMsg: - abort(); - } -#endif if (systemMsgOutput) { systemMsgOutput(type, msg); @@ -154,7 +134,7 @@ void usage() qWarning(" -I <directory> ........................... prepend to the module import search path,"); qWarning(" display path if <directory> is empty"); qWarning(" -P <directory> ........................... prepend to the plugin search path"); -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) qWarning(" -no-opengl ............................... don't use a QGLWidget for the viewport"); qWarning(" -opengl .................................. use a QGLWidget for the viewport (default)"); #else @@ -212,12 +192,8 @@ struct ViewerOptions warningsConfig(DefaultWarnings), sizeToView(true) { -#if defined(Q_OS_SYMBIAN) - maximized = true; - useNativeFileBrowser = false; -#endif -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) useGL = true; #endif } @@ -522,22 +498,6 @@ QDeclarativeViewer *openFile(const QString &fileName) int main(int argc, char ** argv) { systemMsgOutput = qInstallMsgHandler(myMessageOutput); - -#if defined (Q_WS_X11) || defined (Q_WS_MAC) - //### default to using raster graphics backend for now - bool gsSpecified = false; - for (int i = 0; i < argc; ++i) { - QString arg = QString::fromAscii(argv[i]); - if (arg == QLatin1String("-graphicssystem")) { - gsSpecified = true; - break; - } - } - - if (!gsSpecified) - QApplication::setGraphicsSystem(QLatin1String("raster")); -#endif - Application app(argc, argv); app.setApplicationName(QLatin1String("QtQmlViewer")); app.setOrganizationName(QLatin1String("Nokia")); diff --git a/tools/qmlviewer/proxysettings.cpp b/tools/qmlviewer/proxysettings.cpp index 8bc778d18a..bb83d79db9 100644 --- a/tools/qmlviewer/proxysettings.cpp +++ b/tools/qmlviewer/proxysettings.cpp @@ -51,11 +51,7 @@ ProxySettings::ProxySettings (QWidget * parent) : QDialog (parent), Ui::ProxySettings() { setupUi (this); - -#if !defined Q_WS_MAEMO_5 - // the onscreen keyboard can't cope with masks proxyServerEdit->setInputMask(QLatin1String("000.000.000.000;_")); -#endif QIntValidator *validator = new QIntValidator (0, 9999, this); proxyPortEdit->setValidator(validator); diff --git a/tools/qmlviewer/proxysettings.h b/tools/qmlviewer/proxysettings.h index c801221c7b..c15dc198d4 100644 --- a/tools/qmlviewer/proxysettings.h +++ b/tools/qmlviewer/proxysettings.h @@ -44,11 +44,7 @@ #include <QDialog> #include <QNetworkProxy> -#ifdef Q_WS_MAEMO_5 -#include "ui_proxysettings_maemo5.h" -#else #include "ui_proxysettings.h" -#endif QT_BEGIN_NAMESPACE /** diff --git a/tools/qmlviewer/proxysettings_maemo5.ui b/tools/qmlviewer/proxysettings_maemo5.ui deleted file mode 100644 index 75875d835b..0000000000 --- a/tools/qmlviewer/proxysettings_maemo5.ui +++ /dev/null @@ -1,177 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>ProxySettings</class> - <widget class="QDialog" name="ProxySettings"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>447</width> - <height>162</height> - </rect> - </property> - <property name="windowTitle"> - <string>HTTP Proxy</string> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <property name="leftMargin"> - <number>16</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>16</number> - </property> - <property name="bottomMargin"> - <number>8</number> - </property> - <property name="horizontalSpacing"> - <number>16</number> - </property> - <property name="verticalSpacing"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="QCheckBox" name="proxyCheckBox"> - <property name="text"> - <string>Use HTTP Proxy</string> - </property> - </widget> - </item> - <item row="0" column="1" rowspan="2"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0" rowspan="2"> - <widget class="QWidget" name="widget" native="true"> - <layout class="QGridLayout" name="gridLayout"> - <property name="horizontalSpacing"> - <number>16</number> - </property> - <property name="verticalSpacing"> - <number>0</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="serverAddressLabel"> - <property name="text"> - <string>Server</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="proxyServerEdit"> - <property name="placeholderText"> - <string>Name or IP</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Port</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="proxyPortEdit"> - <property name="text"> - <string notr="true">8080</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="usernameLabel"> - <property name="text"> - <string>Username</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="usernameEdit"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="passwordLabel"> - <property name="text"> - <string>Password</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="passwordEdit"> - <property name="echoMode"> - <enum>QLineEdit::Password</enum> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="2" column="1"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>proxyCheckBox</tabstop> - <tabstop>proxyServerEdit</tabstop> - <tabstop>proxyPortEdit</tabstop> - <tabstop>usernameEdit</tabstop> - <tabstop>passwordEdit</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>ProxySettings</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>318</x> - <y>100</y> - </hint> - <hint type="destinationlabel"> - <x>157</x> - <y>116</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>ProxySettings</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>318</x> - <y>100</y> - </hint> - <hint type="destinationlabel"> - <x>286</x> - <y>116</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/tools/qmlviewer/qdeclarativetester.cpp b/tools/qmlviewer/qdeclarativetester.cpp index 842c3a369d..d07b22ea6b 100644 --- a/tools/qmlviewer/qdeclarativetester.cpp +++ b/tools/qmlviewer/qdeclarativetester.cpp @@ -49,9 +49,7 @@ #include <QCryptographicHash> #include <private/qabstractanimation_p.h> #include <QGraphicsObject> -#ifndef Q_OS_SYMBIAN #include <QtQuick1/private/qdeclarativeitem_p.h> -#endif QT_BEGIN_NAMESPACE @@ -269,9 +267,8 @@ void QDeclarativeTester::save() void QDeclarativeTester::updateCurrentTime(int msec) { -#ifndef Q_OS_SYMBIAN QDeclarativeItemPrivate::setConsistentTime(msec); -#endif + if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot) return; @@ -280,14 +277,14 @@ void QDeclarativeTester::updateCurrentTime(int msec) if (options & QDeclarativeViewer::TestImages) { img.fill(qRgb(255,255,255)); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC //Compile failure on Cocoa x64 QTBUG-22304 bool oldSmooth = qt_applefontsmoothing_enabled; qt_applefontsmoothing_enabled = false; -#endif +#endif*/ QPainter p(&img); -#ifdef Q_WS_MAC +/*#ifdef Q_OS_MAC //Compile failure on Cocoa x64 QTBUG-22304 qt_applefontsmoothing_enabled = oldSmooth; -#endif +#endif*/ m_view->render(&p); } diff --git a/tools/qmlviewer/qml.pri b/tools/qmlviewer/qml.pri index e84dfb5c9b..8f54505f0e 100644 --- a/tools/qmlviewer/qml.pri +++ b/tools/qmlviewer/qml.pri @@ -19,25 +19,7 @@ SOURCES += $$PWD/qmlruntime.cpp \ RESOURCES = $$PWD/browser/browser.qrc \ $$PWD/startup/startup.qrc -symbian { - contains(QT_CONFIG, s60) { - LIBS += -lavkon -lcone - } - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { - LIBS += -lsensrvclient -lsensrvutil - SOURCES += $$PWD/deviceorientation_symbian.cpp - } else { - SOURCES += $$PWD/deviceorientation.cpp - } - FORMS = $$PWD/recopts.ui \ - $$PWD/proxysettings.ui -} else:maemo5 { - QT += dbus - HEADERS += $$PWD/texteditautoresizer_maemo5.h - SOURCES += $$PWD/deviceorientation_maemo5.cpp - FORMS = $$PWD/recopts_maemo5.ui \ - $$PWD/proxysettings_maemo5.ui -} else:linux-g++-maemo { +linux-g++-maemo { QT += dbus SOURCES += $$PWD/deviceorientation_harmattan.cpp FORMS = $$PWD/recopts.ui \ diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index 5ece654d08..3daa3d4ea4 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -44,15 +44,7 @@ #ifdef hz #undef hz #endif -#ifdef Q_WS_MAEMO_5 -# include <QMaemo5ValueButton> -# include <QMaemo5ListPickSelector> -# include <QWidgetAction> -# include <QStringListModel> -# include "ui_recopts_maemo5.h" -#else # include "ui_recopts.h" -#endif #include "qmlruntime.h" #include <qdeclarativecontext.h> @@ -96,17 +88,12 @@ #include <QMutexLocker> #include "proxysettings.h" #include "deviceorientation.h" +#include <qdeclarativetester.h> #ifdef GL_SUPPORTED #include <QGLWidget> #endif -#if defined(Q_WS_S60) -#include <aknappui.h> // For locking app orientation -#endif - -#include <qdeclarativetester.h> - QT_BEGIN_NAMESPACE class DragAndDropView : public QDeclarativeView @@ -193,60 +180,6 @@ private: bool activeWindow; }; - - -#if defined(Q_WS_MAEMO_5) - -class Maemo5PickerAction : public QWidgetAction { - Q_OBJECT -public: - Maemo5PickerAction(const QString &text, QActionGroup *actions, QObject *parent) - : QWidgetAction(parent), m_text(text), m_actions(actions) - { } - - QWidget *createWidget(QWidget *parent) - { - QMaemo5ValueButton *button = new QMaemo5ValueButton(m_text, parent); - button->setValueLayout(QMaemo5ValueButton::ValueUnderTextCentered); - QMaemo5ListPickSelector *pick = new QMaemo5ListPickSelector(button); - button->setPickSelector(pick); - if (m_actions) { - QStringList sl; - int curIdx = -1, idx = 0; - foreach (QAction *a, m_actions->actions()) { - sl << a->text(); - if (a->isChecked()) - curIdx = idx; - idx++; - } - pick->setModel(new QStringListModel(sl)); - pick->setCurrentIndex(curIdx); - } else { - button->setEnabled(false); - } - connect(pick, SIGNAL(selected(QString)), this, SLOT(emitTriggered())); - return button; - } - -private slots: - void emitTriggered() - { - QMaemo5ListPickSelector *pick = qobject_cast<QMaemo5ListPickSelector *>(sender()); - if (!pick) - return; - int idx = pick->currentIndex(); - - if (m_actions && idx >= 0 && idx < m_actions->actions().count()) - m_actions->actions().at(idx)->trigger(); - } - -private: - QString m_text; - QPointer<QActionGroup> m_actions; -}; - -#endif // Q_WS_MAEMO_5 - static struct { const char *name, *args; } ffmpegprofiles[] = { {"Maximum Quality", "-sameq"}, {"High Quality", "-qmax 2"}, @@ -263,9 +196,7 @@ public: RecordingDialog(QWidget *parent) : QDialog(parent) { setupUi(this); -#ifndef Q_WS_MAEMO_5 hz->setValidator(new QDoubleValidator(hz)); -#endif for (int i=0; ffmpegprofiles[i].name; ++i) { profile->addItem(QString::fromAscii(ffmpegprofiles[i].name)); } @@ -296,59 +227,25 @@ public: { QString str = tr("Original (%1x%2)").arg(s.width()).arg(s.height()); -#ifdef Q_WS_MAEMO_5 - sizeCombo->setItemText(0, str); -#else sizeOriginal->setText(str); if (sizeWidth->value()<=1) { sizeWidth->setValue(s.width()); sizeHeight->setValue(s.height()); } -#endif } void showffmpegOptions(bool b) { -#ifdef Q_WS_MAEMO_5 - profileLabel->setVisible(b); - profile->setVisible(b); - ffmpegHelp->setVisible(b); - args->setVisible(b); -#else ffmpegOptions->setVisible(b); -#endif } void showRateOptions(bool b) { -#ifdef Q_WS_MAEMO_5 - rateLabel->setVisible(b); - rateCombo->setVisible(b); -#else rateOptions->setVisible(b); -#endif } void setVideoRate(int rate) { -#ifdef Q_WS_MAEMO_5 - int idx; - if (rate >= 60) - idx = 0; - else if (rate >= 50) - idx = 2; - else if (rate >= 25) - idx = 3; - else if (rate >= 24) - idx = 4; - else if (rate >= 20) - idx = 5; - else if (rate >= 15) - idx = 6; - else - idx = 7; - rateCombo->setCurrentIndex(idx); -#else if (rate == 24) hz24->setChecked(true); else if (rate == 25) @@ -361,23 +258,10 @@ public: hzCustom->setChecked(true); hz->setText(QString::number(rate)); } -#endif } int videoRate() const { -#ifdef Q_WS_MAEMO_5 - switch (rateCombo->currentIndex()) { - case 0: return 60; - case 1: return 50; - case 2: return 25; - case 3: return 24; - case 4: return 20; - case 5: return 15; - case 7: return 10; - default: return 60; - } -#else if (hz24->isChecked()) return 24; else if (hz25->isChecked()) @@ -389,20 +273,10 @@ public: else { return hz->text().toInt(); } -#endif } QSize videoSize() const { -#ifdef Q_WS_MAEMO_5 - switch (sizeCombo->currentIndex()) { - case 0: return QSize(); - case 1: return QSize(640,480); - case 2: return QSize(320,240); - case 3: return QSize(1280,720); - default: return QSize(); - } -#else if (sizeOriginal->isChecked()) return QSize(); else if (size720p->isChecked()) @@ -413,7 +287,6 @@ public: return QSize(320,240); else return QSize(sizeWidth->value(), sizeHeight->value()); -#endif } @@ -616,11 +489,6 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags) { QDeclarativeViewer::registerTypes(); setWindowTitle(tr("Qt QML Viewer")); -#ifdef Q_WS_MAEMO_5 - setAttribute(Qt::WA_Maemo5StackedWindow); -// setPalette(QApplication::palette("QLabel")); -#endif - devicemode = false; canvas = 0; record_autotime = 0; @@ -743,10 +611,8 @@ void QDeclarativeViewer::createMenu() connect(slowAction, SIGNAL(triggered(bool)), this, SLOT(setSlowMode(bool))); showWarningsWindow = new QAction(tr("Show Warnings"), this); -#if !defined(Q_OS_SYMBIAN) showWarningsWindow->setCheckable((true)); showWarningsWindow->setChecked(loggerWindow->isVisible()); -#endif connect(showWarningsWindow, SIGNAL(triggered(bool)), this, SLOT(showWarnings(bool))); QAction *proxyAction = new QAction(tr("HTTP &Proxy..."), this); @@ -764,30 +630,22 @@ void QDeclarativeViewer::createMenu() orientation->setExclusive(true); connect(orientation, SIGNAL(triggered(QAction*)), this, SLOT(changeOrientation(QAction*))); -#if defined(Q_OS_SYMBIAN) - QAction *autoOrientationAction = new QAction(tr("Auto-orientation"), this); - autoOrientationAction->setCheckable(true); -#endif QAction *portraitAction = new QAction(tr("Portrait"), this); portraitAction->setCheckable(true); QAction *landscapeAction = new QAction(tr("Landscape"), this); landscapeAction->setCheckable(true); -#if !defined(Q_OS_SYMBIAN) QAction *portraitInvAction = new QAction(tr("Portrait (inverted)"), this); portraitInvAction->setCheckable(true); QAction *landscapeInvAction = new QAction(tr("Landscape (inverted)"), this); landscapeInvAction->setCheckable(true); -#endif QAction *aboutAction = new QAction(tr("&About Qt..."), this); aboutAction->setMenuRole(QAction::AboutQtRole); connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); -#if !defined(Q_OS_SYMBIAN) QAction *closeAction = new QAction(tr("&Close"), this); closeAction->setShortcuts(QKeySequence::Close); connect(closeAction, SIGNAL(triggered()), this, SLOT(close())); -#endif QAction *quitAction = new QAction(tr("&Quit"), this); quitAction->setMenuRole(QAction::QuitRole); @@ -796,34 +654,12 @@ void QDeclarativeViewer::createMenu() QMenuBar *menu = menuBar(); if (!menu) - return; - -#if defined(Q_WS_MAEMO_5) - menu->addAction(openAction); - menu->addAction(openUrlAction); - menu->addAction(reloadAction); - - menu->addAction(snapshotAction); - menu->addAction(recordAction); - - menu->addAction(recordOptions); - menu->addAction(proxyAction); - - menu->addAction(slowAction); - menu->addAction(showWarningsWindow); - - orientation->addAction(landscapeAction); - orientation->addAction(portraitAction); - menu->addAction(new Maemo5PickerAction(tr("Set orientation"), orientation, this)); - menu->addAction(fullscreenAction); - return; -#endif // Q_WS_MAEMO_5 + return; QMenu *fileMenu = menu->addMenu(tr("&File")); fileMenu->addAction(openAction); fileMenu->addAction(openUrlAction); fileMenu->addAction(reloadAction); -#if !defined(Q_OS_SYMBIAN) fileMenu->addSeparator(); fileMenu->addAction(closeAction); fileMenu->addAction(quitAction); @@ -831,7 +667,6 @@ void QDeclarativeViewer::createMenu() QMenu *recordMenu = menu->addMenu(tr("&Recording")); recordMenu->addAction(snapshotAction); recordMenu->addAction(recordAction); -#endif // ! Q_OS_SYMBIAN QMenu *debugMenu = menu->addMenu(tr("&Debugging")); debugMenu->addAction(slowAction); @@ -839,25 +674,16 @@ void QDeclarativeViewer::createMenu() QMenu *settingsMenu = menu->addMenu(tr("&Settings")); settingsMenu->addAction(proxyAction); -#if defined(Q_OS_SYMBIAN) - settingsMenu->addAction(fullscreenAction); -#else settingsMenu->addAction(recordOptions); settingsMenu->addMenu(loggerWindow->preferencesMenu()); -#endif // !Q_OS_SYMBIAN settingsMenu->addAction(rotateAction); QMenu *propertiesMenu = settingsMenu->addMenu(tr("Properties")); -#if defined(Q_OS_SYMBIAN) - orientation->addAction(autoOrientationAction); -#endif orientation->addAction(portraitAction); orientation->addAction(landscapeAction); -#if !defined(Q_OS_SYMBIAN) orientation->addAction(portraitInvAction); orientation->addAction(landscapeInvAction); -#endif propertiesMenu->addActions(orientation->actions()); QMenu *helpMenu = menu->addMenu(tr("&Help")); @@ -881,23 +707,6 @@ void QDeclarativeViewer::proxySettingsChanged() void QDeclarativeViewer::rotateOrientation() { -#if defined(Q_WS_S60) - CAknAppUi *appUi = static_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi()); - if (appUi) { - CAknAppUi::TAppUiOrientation oldOrientation = appUi->Orientation(); - QString newOrientation; - if (oldOrientation == CAknAppUi::EAppUiOrientationPortrait) { - newOrientation = QLatin1String("Landscape"); - } else { - newOrientation = QLatin1String("Portrait"); - } - foreach (QAction *action, orientation->actions()) { - if (action->text() == newOrientation) { - changeOrientation(action); - } - } - } -#else QAction *current = orientation->checkedAction(); QList<QAction *> actions = orientation->actions(); int index = actions.indexOf(current); @@ -906,7 +715,6 @@ void QDeclarativeViewer::rotateOrientation() QAction *newOrientation = actions[(index + 1) % actions.count()]; changeOrientation(newOrientation); -#endif } void QDeclarativeViewer::toggleFullScreen() @@ -919,11 +727,7 @@ void QDeclarativeViewer::toggleFullScreen() void QDeclarativeViewer::showWarnings(bool show) { -#if defined(Q_OS_SYMBIAN) - loggerWindow->showMaximized(); -#else loggerWindow->setVisible(show); -#endif } void QDeclarativeViewer::warningsWidgetOpened() @@ -1118,12 +922,7 @@ bool QDeclarativeViewer::open(const QString& file_or_url) canvas->engine()->clearComponentCache(); QDeclarativeContext *ctxt = canvas->rootContext(); ctxt->setContextProperty(QLatin1String("qmlViewer"), this); -#ifdef Q_OS_SYMBIAN - ctxt->setContextProperty(QLatin1String("qmlViewerFolder"), QLatin1String("E:\\")); // Documents on your S60 phone -#else ctxt->setContextProperty(QLatin1String("qmlViewerFolder"), QDir::currentPath()); -#endif - ctxt->setContextProperty(QLatin1String("runtime"), Runtime::instance()); QString fileName = url.toLocalFile(); @@ -1443,22 +1242,6 @@ void QDeclarativeViewer::changeOrientation(QAction *action) return; QString o = action->text(); action->setChecked(true); -#if defined(Q_WS_S60) - CAknAppUi *appUi = static_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi()); - if (appUi) { - CAknAppUi::TAppUiOrientation orientation = appUi->Orientation(); - if (o == QLatin1String("Auto-orientation")) { - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationAutomatic); - rotateAction->setVisible(false); - } else if (o == QLatin1String("Portrait")) { - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait); - rotateAction->setVisible(true); - } else if (o == QLatin1String("Landscape")) { - appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape); - rotateAction->setVisible(true); - } - } -#else if (o == QLatin1String("Portrait")) DeviceOrientation::instance()->setOrientation(DeviceOrientation::Portrait); else if (o == QLatin1String("Landscape")) @@ -1467,7 +1250,6 @@ void QDeclarativeViewer::changeOrientation(QAction *action) DeviceOrientation::instance()->setOrientation(DeviceOrientation::PortraitInverted); else if (o == QLatin1String("Landscape (inverted)")) DeviceOrientation::instance()->setOrientation(DeviceOrientation::LandscapeInverted); -#endif } void QDeclarativeViewer::orientationChanged() @@ -1490,7 +1272,7 @@ void QDeclarativeViewer::setUseGL(bool useGL) #ifdef GL_SUPPORTED if (useGL) { QGLFormat format = QGLFormat::defaultFormat(); -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC format.setSampleBuffers(true); format.setSwapInterval(1); #else diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 1f7a6024f4..980c1d4b3c 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -17,20 +17,6 @@ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII target.path = $$[QT_INSTALL_BINS] INSTALLS += target -maemo5 { - QT += maemo5 -} -symbian { - TARGET.UID3 = 0x20021317 - CONFIG += qt_demo - TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 - TARGET.CAPABILITY = NetworkServices ReadUserData - - # Deploy plugin for remote debugging - qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_tcp$${QT_LIBINFIX}.dll $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_ost$${QT_LIBINFIX}.dll - qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling - DEPLOYMENT += qmldebuggingplugin -} mac { QMAKE_INFO_PLIST=Info_mac.plist TARGET=QMLViewer diff --git a/tools/qmlviewer/recopts_maemo5.ui b/tools/qmlviewer/recopts_maemo5.ui deleted file mode 100644 index 3bb5ecabd9..0000000000 --- a/tools/qmlviewer/recopts_maemo5.ui +++ /dev/null @@ -1,254 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>RecordingOptions</class> - <widget class="QDialog" name="RecordingOptions"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>469</width> - <height>142</height> - </rect> - </property> - <property name="windowTitle"> - <string>Video options</string> - </property> - <layout class="QGridLayout" name="gridLayout" columnstretch="0,2,0"> - <property name="sizeConstraint"> - <enum>QLayout::SetMinAndMaxSize</enum> - </property> - <property name="leftMargin"> - <number>16</number> - </property> - <property name="topMargin"> - <number>0</number> - </property> - <property name="rightMargin"> - <number>16</number> - </property> - <property name="bottomMargin"> - <number>8</number> - </property> - <property name="horizontalSpacing"> - <number>16</number> - </property> - <property name="verticalSpacing"> - <number>0</number> - </property> - <item row="0" column="1"> - <widget class="QLineEdit" name="file"/> - </item> - <item row="0" column="2" rowspan="3"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>72</width> - <height>56</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Size</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="sizeCombo"> - <item> - <property name="text"> - <string/> - </property> - </item> - <item> - <property name="text"> - <string>VGA</string> - </property> - </item> - <item> - <property name="text"> - <string>QVGA</string> - </property> - </item> - <item> - <property name="text"> - <string>720p</string> - </property> - </item> - </widget> - </item> - <item row="2" column="0" rowspan="2"> - <widget class="QLabel" name="rateLabel"> - <property name="text"> - <string>Rate</string> - </property> - </widget> - </item> - <item row="2" column="1" rowspan="2"> - <widget class="QComboBox" name="rateCombo"> - <item> - <property name="text"> - <string>60 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>50 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>25 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>24 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>20 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>15 Hz</string> - </property> - </item> - <item> - <property name="text"> - <string>10 Hz</string> - </property> - </item> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLineEdit" name="args"/> - </item> - <item row="4" column="1"> - <widget class="QComboBox" name="profile"/> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="profileLabel"> - <property name="text"> - <string>Profile</string> - </property> - </widget> - </item> - <item row="6" column="0" colspan="2"> - <widget class="QLabel" name="warning"> - <property name="text"> - <string notr="true">warning</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="2" rowspan="3"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QPushButton" name="pickfile"> - <property name="text"> - <string>File</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QPushButton" name="ffmpegHelp"> - <property name="text"> - <string>Options</string> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>RecordingOptions</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>258</x> - <y>424</y> - </hint> - <hint type="destinationlabel"> - <x>60</x> - <y>219</y> - </hint> - </hints> - </connection> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>RecordingOptions</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel"> - <x>258</x> - <y>424</y> - </hint> - <hint type="destinationlabel"> - <x>92</x> - <y>219</y> - </hint> - </hints> - </connection> - <connection> - <sender>profile</sender> - <signal>activated(int)</signal> - <receiver>RecordingOptions</receiver> - <slot>pickProfile(int)</slot> - <hints> - <hint type="sourcelabel"> - <x>92</x> - <y>329</y> - </hint> - <hint type="destinationlabel"> - <x>48</x> - <y>194</y> - </hint> - </hints> - </connection> - <connection> - <sender>args</sender> - <signal>textEdited(QString)</signal> - <receiver>RecordingOptions</receiver> - <slot>storeCustomArgs(QString)</slot> - <hints> - <hint type="sourcelabel"> - <x>128</x> - <y>357</y> - </hint> - <hint type="destinationlabel"> - <x>102</x> - <y>189</y> - </hint> - </hints> - </connection> - </connections> - <slots> - <signal>filePicked(QString)</signal> - <signal>argumentsPicked(QString)</signal> - <slot>pickFile()</slot> - <slot>pickProfile(int)</slot> - <slot>storeCustomArgs(QString)</slot> - </slots> -</ui> diff --git a/tools/qmlviewer/texteditautoresizer_maemo5.h b/tools/qmlviewer/texteditautoresizer_maemo5.h deleted file mode 100644 index 10bf4a1443..0000000000 --- a/tools/qmlviewer/texteditautoresizer_maemo5.h +++ /dev/null @@ -1,113 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtGui/qplaintextedit.h> -#include <QtGui/qtextedit.h> -#include <QtGui/qscroller.h> -#include <QtGui/qscrollarea.h> -#include <QtDebug> - -#ifndef TEXTEDITAUTORESIZER_H -#define TEXTEDITAUTORESIZER_H - -class TextEditAutoResizer : public QObject -{ - Q_OBJECT -public: - TextEditAutoResizer(QWidget *parent) - : QObject(parent), plainTextEdit(qobject_cast<QPlainTextEdit *>(parent)), - textEdit(qobject_cast<QTextEdit *>(parent)), edit(qobject_cast<QFrame *>(parent)) - { - // parent must either inherit QPlainTextEdit or QTextEdit! - Q_ASSERT(plainTextEdit || textEdit); - - connect(parent, SIGNAL(textChanged()), this, SLOT(textEditChanged())); - connect(parent, SIGNAL(cursorPositionChanged()), this, SLOT(textEditChanged())); - - textEditChanged(); - } - -private Q_SLOTS: - inline void textEditChanged(); - -private: - QPlainTextEdit *plainTextEdit; - QTextEdit *textEdit; - QFrame *edit; -}; - -void TextEditAutoResizer::textEditChanged() -{ - QTextDocument *doc = textEdit ? textEdit->document() : plainTextEdit->document(); - QRect cursor = textEdit ? textEdit->cursorRect() : plainTextEdit->cursorRect(); - - QSize s = doc->size().toSize(); - if (plainTextEdit) - s.setHeight((s.height() + 2) * edit->fontMetrics().lineSpacing()); - - const QRect fr = edit->frameRect(); - const QRect cr = edit->contentsRect(); - - edit->setMinimumHeight(qMax(70, s.height() + (fr.height() - cr.height() - 1))); - - // make sure the cursor is visible in case we have a QAbstractScrollArea parent - QPoint pos = edit->pos(); - QWidget *pw = edit->parentWidget(); - while (pw) { - if (qobject_cast<QScrollArea *>(pw)) - break; - pw = pw->parentWidget(); - } - - if (pw) { - QScrollArea *area = static_cast<QScrollArea *>(pw); - QPoint scrollto = area->widget()->mapFrom(edit, cursor.center()); - QPoint margin(10 + cursor.width(), 2 * cursor.height()); - -#ifdef Q_WS_MAEMO_5 - QScroller::scroller(area)->ensureVisible(scrollto, margin.x(), margin.y()); -#else - area->ensureVisible(scrollto.x(), scrollto.y(), margin.x(), margin.y()); -#endif - } -} - -#endif |