diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-05-07 22:26:51 -0700 |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2012-05-08 10:47:12 +0200 |
| commit | 98cc32b5554fc27c780a906ae94197c6c8bf9aa5 (patch) | |
| tree | c663be21108c0966c49d1425b0d321f069545c17 | |
| parent | 62d427a1da7d0980d8d2992629fd3e9dd7229ab4 (diff) | |
| download | qtquickcontrols-98cc32b5554fc27c780a906ae94197c6c8bf9aa5.tar.gz | |
Remove symbian support.
Change-Id: Ibe4653ffdee2b28b3def1c9f29bfd895da756810
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| -rw-r--r-- | components/components.pro | 14 | ||||
| -rw-r--r-- | components/custom/components.pro | 14 | ||||
| -rw-r--r-- | src/src.pro | 12 | ||||
| -rw-r--r-- | src/styleitem/styleitem.pro | 12 |
4 files changed, 6 insertions, 46 deletions
diff --git a/components/components.pro b/components/components.pro index 02ca9490..519579b7 100644 --- a/components/components.pro +++ b/components/components.pro @@ -1,12 +1,6 @@ TEMPLATE = subdirs # XXX: Avoid calling the linker TARGETPATH = QtDesktop -symbian { - INSTALL_IMPORTS = /resource/qt/imports -} else { - INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS] -} - QML_FILES = \ qmldir \ Label.qml \ @@ -49,14 +43,10 @@ QML_DIRS = \ qmlfiles.files = $$QML_FILES qmlfiles.sources = $$QML_FILES -qmlfiles.path = $$INSTALL_IMPORTS/$$TARGETPATH +qmlfiles.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldirs.files = $$QML_DIRS qmldirs.sources = $$QML_DIRS -qmldirs.path = $$INSTALL_IMPORTS/$$TARGETPATH +qmldirs.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += qmlfiles qmldirs - -symbian { - DEPLOYMENT += qmlfiles qmldirs -} diff --git a/components/custom/components.pro b/components/custom/components.pro index e063d91d..5ab59ce7 100644 --- a/components/custom/components.pro +++ b/components/custom/components.pro @@ -1,12 +1,6 @@ TEMPLATE = subdirs # XXX: Avoid call the linker TARGETPATH = Qt/labs/components/custom -symbian { - INSTALL_IMPORTS = /resource/qt/imports -} else { - INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS] -} - QML_FILES = \ qmldir \ BasicButton.qml \ @@ -36,14 +30,10 @@ QML_DIRS = \ qmlfiles.files = $$QML_FILES qmlfiles.sources = $$QML_FILES -qmlfiles.path = $$INSTALL_IMPORTS/$$TARGETPATH +qmlfiles.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldirs.files = $$QML_DIRS qmldirs.sources = $$QML_DIRS -qmldirs.path = $$INSTALL_IMPORTS/$$TARGETPATH +qmldirs.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += qmlfiles qmldirs - -symbian { - DEPLOYMENT += qmlfiles qmldirs -} diff --git a/src/src.pro b/src/src.pro index b3a16983..646daebd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -33,13 +33,7 @@ SOURCES += qrangemodel.cpp \ TARGETPATH = QtDesktop/plugin -symbian { - INSTALL_IMPORTS = /resource/qt/imports -} else { - INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS] -} - -target.path = $$INSTALL_IMPORTS/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH win32 { CONFIG(debug, debug|release) { @@ -52,7 +46,3 @@ mac { } INSTALLS += target - -symbian { - DEPLOYMENT += target -} diff --git a/src/styleitem/styleitem.pro b/src/styleitem/styleitem.pro index 464d4d44..91162110 100644 --- a/src/styleitem/styleitem.pro +++ b/src/styleitem/styleitem.pro @@ -35,16 +35,6 @@ SOURCES += qtmenu.cpp \ TARGETPATH = QtDesktop/plugin -symbian { - INSTALL_IMPORTS = /resource/qt/imports -} else { - INSTALL_IMPORTS = $$[QT_INSTALL_IMPORTS] -} - -target.path = $$INSTALL_IMPORTS/$$TARGETPATH +target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target - -symbian { - DEPLOYMENT += target -} |