diff options
26 files changed, 16 insertions, 96 deletions
@@ -207,28 +207,6 @@ doc-build .pch .metadata -# Symbian build system generated files -# --------------------- - -ABLD.BAT -bld.inf* -*.mmp -*.mk -*.rss -*.loc -!s60main.rss -*.pkg -plugin_commonu.def -*.qtplugin -*.sis -*.sisx -*.lst -*.exe -*.mif -*.rsc -*.sym -*.lib - # runonphone crash dumps d_exc_*.txt d_exc_*.stk diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro index 4b3430a..bae24ec 100644 --- a/examples/xmlpatterns/filetree/filetree.pro +++ b/examples/xmlpatterns/filetree/filetree.pro @@ -11,12 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/filetree INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000D7C4 - CONFIG += qt_example -} maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/recipes/main.cpp b/examples/xmlpatterns/recipes/main.cpp index dffe969..81ac5cc 100644 --- a/examples/xmlpatterns/recipes/main.cpp +++ b/examples/xmlpatterns/recipes/main.cpp @@ -47,11 +47,7 @@ int main(int argc, char* argv[]) Q_INIT_RESOURCE(recipes); QApplication app(argc, argv); QueryMainWindow* const queryWindow = new QueryMainWindow; -#ifdef Q_OS_SYMBIAN - queryWindow->showMaximized(); -#else queryWindow->show(); -#endif return app.exec(); } //! [0] diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h index 4a653e5..75d5c27 100644 --- a/examples/xmlpatterns/recipes/querymainwindow.h +++ b/examples/xmlpatterns/recipes/querymainwindow.h @@ -43,7 +43,7 @@ #include <QMainWindow> -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) #include "ui_querywidget_mobiles.h" #else #include "ui_querywidget.h" diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro index 2e1f8ec..44c2557 100644 --- a/examples/xmlpatterns/recipes/recipes.pro +++ b/examples/xmlpatterns/recipes/recipes.pro @@ -11,9 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html forms files sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/recipes INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000D7C5 - CONFIG += qt_example -} maemo5: CONFIG += qt_example diff --git a/examples/xmlpatterns/schema/main.cpp b/examples/xmlpatterns/schema/main.cpp index 39094be..99c50d6 100644 --- a/examples/xmlpatterns/schema/main.cpp +++ b/examples/xmlpatterns/schema/main.cpp @@ -47,11 +47,7 @@ int main(int argc, char* argv[]) Q_INIT_RESOURCE(schema); QApplication app(argc, argv); MainWindow* const window = new MainWindow; -#ifdef Q_OS_SYMBIAN - window->showMaximized(); -#else window->show(); -#endif return app.exec(); } //! [0] diff --git a/examples/xmlpatterns/schema/mainwindow.h b/examples/xmlpatterns/schema/mainwindow.h index b376c15..ff7246a 100644 --- a/examples/xmlpatterns/schema/mainwindow.h +++ b/examples/xmlpatterns/schema/mainwindow.h @@ -43,7 +43,7 @@ #include <QMainWindow> -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) +#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) #include "ui_schema_mobiles.h" #else #include "ui_schema.h" diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro index 61b147c..b2a63da 100644 --- a/examples/xmlpatterns/schema/schema.pro +++ b/examples/xmlpatterns/schema/schema.pro @@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html files sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/schema INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000D7C6 - CONFIG += qt_example -} maemo5: CONFIG += qt_example diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro index 8a12910..8367f09 100644 --- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro +++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro @@ -8,12 +8,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/trafficinfo INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000D7C7 - CONFIG += qt_example -} maemo5: CONFIG += qt_example -symbian: warning(This example might not fully work on Symbian platform) maemo5: warning(This example might not fully work on Maemo platform) simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro index b5c695d..c3128b0 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro +++ b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro @@ -8,5 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.cpp *.pro *.xq *.html sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVariables INSTALLS += target sources -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro index 5e5c4fa..0084f1d 100644 --- a/examples/xmlpatterns/xquery/xquery.pro +++ b/examples/xmlpatterns/xquery/xquery.pro @@ -7,5 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xquery.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery INSTALLS += target sources -symbian: CONFIG += qt_example maemo5: CONFIG += qt_example diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index c1960c7..f9cefaf 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -39,5 +39,3 @@ wince* { QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ } } - -symbian:TARGET.UID3 = 0x2001E62B diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index 3f0122b..c1adf15 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -6,7 +6,7 @@ QT = core gui testlib include (../xmlpatterns.pri) -wince*|symbian: { +wince*: { QT += network addFiles.files = \ $$QT_SOURCE_TREE/examples/sql/masterdetail/albumdetails.xml \ diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro index 0790854..c36c120 100644 --- a/tests/auto/patternistexamples/patternistexamples.pro +++ b/tests/auto/patternistexamples/patternistexamples.pro @@ -2,7 +2,7 @@ TARGET = tst_patternistexamples CONFIG += testcase SOURCES += tst_patternistexamples.cpp QT += testlib -wince*|symbian: { +wince*: { snippets.files = $$QT_SOURCE_TREE/doc/src/snippets/patternist/* snippets.path = patternist widgetRen.files = $$QT_SOURCE_TREE/examples/xmlpatterns/xquery/widgetRenderer/* diff --git a/tests/auto/qxmlformatter/qxmlformatter.pro b/tests/auto/qxmlformatter/qxmlformatter.pro index 054b3dc..71cf56d 100644 --- a/tests/auto/qxmlformatter/qxmlformatter.pro +++ b/tests/auto/qxmlformatter/qxmlformatter.pro @@ -5,7 +5,7 @@ SOURCES += tst_qxmlformatter.cpp include (../xmlpatterns.pri) -wince*|symbian:{ +wince*:{ addFiles.files = baselines input addFiles.path = . DEPLOYMENT += addFiles diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro index 48cf8d4..66e1158 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -13,23 +13,18 @@ QT += network testlib wince* { DEFINES += SRCDIR=\\\"./\\\" -} else:!symbian { +} else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } include (../xmlpatterns.pri) -wince*|symbian: { +wince*: { addFiles.files = pushBaselines input.xml addFiles.path = . patternistFiles.files = ../xmlpatterns/queries - symbian: { - #../xmlpatterns resolves to an illegal path for deployment - patternistFiles.path = xmlpatterns - } else { - patternistFiles.path = ../xmlpatterns - } + patternistFiles.path = ../xmlpatterns DEPLOYMENT += addFiles patternistFiles } diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 838e062..27f3964 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -63,12 +63,7 @@ #include "TestFundament.h" #include "../network-settings.h" -#if defined(Q_OS_SYMBIAN) -#define SRCDIR "" -#define XMLPATTERNSDIR "xmlpatterns" -#else #define XMLPATTERNSDIR SRCDIR "../xmlpatterns" -#endif /*! \class tst_QXmlQuery diff --git a/tests/auto/xmlpatterns.pri b/tests/auto/xmlpatterns.pri index 1d978f3..320d6cb 100644 --- a/tests/auto/xmlpatterns.pri +++ b/tests/auto/xmlpatterns.pri @@ -12,7 +12,6 @@ QT -= gui XMLPATTERNS_SDK = QtXmlPatternsSDK if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - symbian: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK} - else:win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d - else: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug + win32: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}d + else: XMLPATTERNS_SDK = $${XMLPATTERNS_SDK}_debug } diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index b3d745b..2d67bcd 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -46,10 +46,6 @@ #include "../qxmlquery/TestFundament.h" #include "../network-settings.h" -#if defined(Q_OS_SYMBIAN) -#define SRCDIR "" -#endif - /*! \class tst_XmlPatterns \internal @@ -136,8 +132,6 @@ void tst_XmlPatterns::xquerySupport() #ifdef Q_OS_WINCE QSKIP("WinCE: This test uses unsupported WinCE functionality"); -#elif defined(Q_OS_SYMBIAN) - QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)"); #elif defined(Q_OS_MAC) QSKIP("MacOs: Failed on Mac. Will be fixed by bug fix for QTBUG-22556"); #endif @@ -230,7 +224,7 @@ void tst_XmlPatterns::xquerySupport() void tst_XmlPatterns::xquerySupport_data() const { -#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WINCE) return; #endif @@ -861,8 +855,6 @@ void tst_XmlPatterns::xsltSupport_data() const #ifdef Q_OS_WINCE QSKIP("WinCE: This test uses unsupported WinCE functionality"); -#elif defined(Q_OS_SYMBIAN) - QSKIP("Symbian: This test uses unsupported Symbian functionality (QProcess with std streams)"); #endif QTest::addColumn<int>("expectedExitCode"); diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro index 8716b9a..a775c2e 100644 --- a/tests/auto/xmlpatterns/xmlpatterns.pro +++ b/tests/auto/xmlpatterns/xmlpatterns.pro @@ -6,7 +6,7 @@ SOURCES += tst_xmlpatterns.cpp \ wince* { DEFINES += SRCDIR=\\\"./\\\" -} else:!symbian { +} else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro index 14810ac..2e858a0 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro +++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro @@ -19,7 +19,7 @@ INCLUDEPATH += $$(QTSRCDIR)/tests/auto/xmlpatternssdk \ ../xmlpatternsxqts \ ../xmlpatternssdk -wince*|symbian { +wince* { catalog.files = TestSuite Baseline.xml catalog.path = . DEPLOYMENT += catalog diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index 29bef87..bc5ecd7 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -10,9 +10,8 @@ SOURCES += ../xmlpatternsxqts/tst_suitetest.cpp PATTERNIST_SDK = QtXmlPatternsSDK if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - symbian: PATTERNIST_SDK = $${PATTERNIST_SDK} - else:win32: PATTERNIST_SDK = $${PATTERNIST_SDK}d - else: PATTERNIST_SDK = $${PATTERNIST_SDK}_debug + win32: PATTERNIST_SDK = $${PATTERNIST_SDK}d + else: PATTERNIST_SDK = $${PATTERNIST_SDK}_debug } LIBS += -L$$QT.xmlpatterns.libs -l$$PATTERNIST_SDK diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h index 3f203a7..fb9472c 100644 --- a/tests/auto/xmlpatternssdk/Global.h +++ b/tests/auto/xmlpatternssdk/Global.h @@ -47,7 +47,7 @@ #include <private/qitem_p.h> #include <private/qnamepool_p.h> -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) # ifdef Q_PATTERNISTSDK_BUILDING #define Q_PATTERNISTSDK_EXPORT __declspec(dllexport) #else diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro index db9c3a9..395cce8 100644 --- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro +++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro @@ -15,12 +15,6 @@ mac { INSTALLS += target } -symbian { - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = All -Tcb - MMP_RULES += EXPORTUNFROZEN -} - # We add gui, because xmlpatterns.pri pull it out. QT += xmlpatterns xml network testlib gui diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro index 2391c96..d295efc 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -24,5 +24,4 @@ HEADERS = main.h \ qapplicationargument.cpp \ qapplicationargumentparser.cpp -symbian: TARGET.UID3 = 0xA000D7C9 diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro index fd367a2..d5ab070 100644 --- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro +++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro @@ -16,4 +16,3 @@ CONFIG -= app_bundle SOURCES = main.cpp HEADERS = main.h -symbian: TARGET.UID3 = 0xA000D7CA |