summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-11-18 11:06:10 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-11-18 11:17:31 (GMT)
commit31feffb92570c6e13618cc2d0d03a5f243a7e350 (patch)
treeeae333e0003de10dd548e325fe64153d0b0638db /src/plugins
parent7b11aaf3c4e95afd4eacd84296705557d8467a9d (diff)
downloadQt-31feffb92570c6e13618cc2d0d03a5f243a7e350.zip
Qt-31feffb92570c6e13618cc2d0d03a5f243a7e350.tar.gz
Qt-31feffb92570c6e13618cc2d0d03a5f243a7e350.tar.bz2
Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
Due to somewhat questionable .pro-file flagging, the plugin is not currently compiled at all for latest Sym^3 environments. Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the upcoming platform versions change, this should work in the future. Task-number: QTBUG-15428 Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/s60/feedback/feedback.pro2
-rw-r--r--src/plugins/s60/s60.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro
index 1069220..5e577ec 100644
--- a/src/plugins/s60/feedback/feedback.pro
+++ b/src/plugins/s60/feedback/feedback.pro
@@ -6,7 +6,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback
INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
+!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
HEADERS += qtactileFeedback.h
SOURCES += qtactileFeedback_s60.cpp
diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro
index ffcd170..1ddf326 100644
--- a/src/plugins/s60/s60.pro
+++ b/src/plugins/s60/s60.pro
@@ -6,7 +6,7 @@ symbian {
SUBDIRS += 3_1 3_2
}
- contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
+ !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
SUBDIRS += feedback
}