From f93bc7fabd380cf10be7f90903ace618074dc871 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:43:28 +0100 Subject: remove symbian & maemo5 vestiges Change-Id: I4c02f91abde94d9ee7d154efa6eb371e1a8dfd71 Reviewed-by: Robin Burchell --- .../animation/behaviors/wigglytext/wigglytext.pro | 9 --------- .../righttoleft/layoutdirection/layoutdirection.pro | 12 ------------ .../righttoleft/layoutmirroring/layoutmirroring.pro | 12 ------------ .../declarative/righttoleft/textalignment/textalignment.pro | 12 ------------ examples/declarative/shadereffects/shadereffects.pro | 4 ---- .../extending/chapter6-plugins/chapter6-plugins.pro | 2 -- tests/auto/declarative/symbianlibs.pri | 9 --------- 7 files changed, 60 deletions(-) delete mode 100644 tests/auto/declarative/symbianlibs.pri diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro index 4c46a119..e110924e 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -12,15 +12,6 @@ QML_IMPORT_PATH = # Needs to be defined for Symbian #DEFINES += NETWORKACCESS -symbian:TARGET.UID3 = 0xEB6022A4 - -# Smart Installer package's UID -# This UID is from the protected range -# and therefore the package will fail to install if self-signed -# By default qmake uses the unprotected range value if unprotected UID is defined for the application -# and 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - # Define QMLJSDEBUGGER to allow debugging of QML in debug builds # (This might significantly increase build time) # DEFINES += QMLJSDEBUGGER diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro index 402d8344..520ad6d8 100644 --- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro +++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE12C9D9E - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro index eb6ab5c5..ffcc4d0c 100644 --- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro +++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE2EC19CA - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro index fd2ee263..afc8df88 100644 --- a/examples/declarative/righttoleft/textalignment/textalignment.pro +++ b/examples/declarative/righttoleft/textalignment/textalignment.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE061C700 - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index 742903e3..4911a52b 100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro @@ -19,10 +19,6 @@ QT += declarative opengl # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp -symbian { - DEFINES += SHADEREFFECTS_USE_OPENGL_GRAPHICSSYSTEM -} - # Please do not modify the following two lines. Required for deployment. desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index f4013d5f..f8012e66 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -16,8 +16,6 @@ SOURCES += piechart.cpp \ OTHER_FILES += chartsplugin.json -maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter6-plugins sources.files = $$SOURCES $$HEADERS $$OTHER_FILES app.qml chapter6-plugins.pro diff --git a/tests/auto/declarative/symbianlibs.pri b/tests/auto/declarative/symbianlibs.pri deleted file mode 100644 index 4452f67f..00000000 --- a/tests/auto/declarative/symbianlibs.pri +++ /dev/null @@ -1,9 +0,0 @@ -#additional libs required for orientation sensor -symbian { - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { - LIBS += -lsensrvclient -lsensrvutil - } - contains(QT_CONFIG, s60): { - LIBS += -lavkon -lcone - } -} -- cgit v1.2.3