diff options
19 files changed, 12 insertions, 113 deletions
diff --git a/examples/designer/arthurplugin/arthurplugin.pro b/examples/designer/arthurplugin/arthurplugin.pro index f037c35fb..58e52a67e 100644 --- a/examples/designer/arthurplugin/arthurplugin.pro +++ b/examples/designer/arthurplugin/arthurplugin.pro @@ -45,8 +45,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/arthurplugin INSTALLS += target sources -symbian: CONFIG += qt_example - win32-msvc* { QMAKE_CFLAGS += /Zm500 QMAKE_CXXFLAGS += /Zm500 diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro index 1e0a35e42..a2511f73b 100644 --- a/examples/designer/calculatorbuilder/calculatorbuilder.pro +++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro @@ -13,9 +13,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorbuilder sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorbuilder INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro index b2a7427c6..e7cbf98f6 100644 --- a/examples/designer/calculatorform/calculatorform.pro +++ b/examples/designer/calculatorform/calculatorform.pro @@ -12,10 +12,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index fc7a1ff81..add7e4402 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -26,8 +26,3 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/containerextension INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index e70fe6575..76c22bbd0 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -20,9 +20,3 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/customwidgetplugin INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro index 52e7b4440..f02639443 100644 --- a/examples/designer/designer.pro +++ b/examples/designer/designer.pro @@ -17,6 +17,3 @@ solaris-cc*:SUBDIRS -= calculatorbuilder \ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer INSTALLS += sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index aaf3ab89c..fbc57f464 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -24,9 +24,3 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/taskmenuextension INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro index 005e35043..716d9045a 100644 --- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro +++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro @@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockbuilder sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockbuilder INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index 8caad5e92..94dbd0c6c 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -20,6 +20,3 @@ target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockplugin INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro index 9fa1a2a66..29686b67d 100644 --- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro +++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro @@ -16,10 +16,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/help/help.pro b/examples/help/help.pro index 57b01a302..e0d19e64b 100644 --- a/examples/help/help.pro +++ b/examples/help/help.pro @@ -9,6 +9,3 @@ SUBDIRS += contextsensitivehelp \ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help INSTALLS += sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro index 79fb7c1be..e972857f8 100644 --- a/examples/help/remotecontrol/remotecontrol.pro +++ b/examples/help/remotecontrol/remotecontrol.pro @@ -13,9 +13,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/remotecontrol INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro index 5ef14c44a..33dc7281e 100644 --- a/examples/help/simpletextviewer/simpletextviewer.pro +++ b/examples/help/simpletextviewer/simpletextviewer.pro @@ -15,10 +15,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer INSTALLS += target sources - -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index 7e6496741..b967c33d5 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -10,10 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/multipleinheritance INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000D7C1 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example - diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro index 337b7216e..acf95c3c6 100644 --- a/examples/uitools/textfinder/textfinder.pro +++ b/examples/uitools/textfinder/textfinder.pro @@ -9,9 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro forms sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example - -symbian: warning(This example does not work on Symbian platform) -simulator: warning(This example does not work on Simulator platform) diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro index f17de666f..04cf4ba17 100644 --- a/examples/uitools/uitools.pro +++ b/examples/uitools/uitools.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS = multipleinheritance -!wince*:!symbian:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder +!wince*:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools @@ -9,6 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS uitools.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index ca25014c0..ccecf9aac 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -9,11 +9,6 @@ MODULE_PRI = ../modules/qt_uitools.pri DESTDIR = $$QMAKE_LIBDIR_QT -symbian { - TARGET.UID3 = 0x2001E628 - load(armcc_warnings) -} - win32|mac:!macx-xcode:CONFIG += debug_and_release build_all DEFINES += QFORMINTERNAL_NAMESPACE QT_DESIGNER_STATIC QT_FORMBUILDER_NO_SCRIPT diff --git a/src/src.pro b/src/src.pro index 8b6a706bb..c335d5076 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,26 +4,20 @@ TEMPLATE = subdirs no-png { message("Some graphics-related tools are unavailable without PNG support") } else { - symbian { - SUBDIRS = designer - } else:wince* { - SUBDIRS = qtestlib designer + SUBDIRS = assistant \ + pixeltool \ + qtestlib \ + qttracereplay + contains(QT_EDITION, Console) { + SUBDIRS += designer/src/uitools # Linguist depends on this } else { - SUBDIRS = assistant \ - pixeltool \ - qtestlib \ - qttracereplay - contains(QT_EDITION, Console) { - SUBDIRS += designer/src/uitools # Linguist depends on this - } else { - SUBDIRS += designer - } + SUBDIRS += designer } -# unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig +# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig } } -!wince*:!symbian:SUBDIRS += linguist +SUBDIRS += linguist mac { SUBDIRS += macdeployqt @@ -38,6 +32,6 @@ embedded: SUBDIRS += makeqpf CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" -!win32:!embedded:!mac:!symbian:CONFIG += x11 +!win32:!embedded:!mac:CONFIG += x11 x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper diff --git a/tests/auto/uiloader/uiloader/uiloader.pro b/tests/auto/uiloader/uiloader/uiloader.pro index 42633102a..c458f29ef 100644 --- a/tests/auto/uiloader/uiloader/uiloader.pro +++ b/tests/auto/uiloader/uiloader/uiloader.pro @@ -3,7 +3,7 @@ CONFIG += testcase TEMPLATE = app !embedded:CONFIG += uitools TARGET = ../tst_uiloader -!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" +DEFINES += SRCDIR=\\\"$$PWD\\\" win32 { CONFIG(debug, debug|release) { @@ -15,16 +15,6 @@ win32 { QT += widgets network testlib -wince*|symbian: { - configuration.files = ../*.ini - configuration.path = . - - screenapp.files = ../tst_screenshot/tst_screenshot.exe - screenapp.path = tst_screenshot - - DEPLOYMENT += configuration screenapp -} - # Input HEADERS += uiloader.h SOURCES += tst_uiloader.cpp uiloader.cpp |