Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # ===[ Subject ]==========[ one line, please wrap at 72 characters ]===|
- Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
- # ---[ Details ]---------[ remember extra blank line after subject ]---|
- 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.
- # ---[ Fields ]-----------------[ uncomment and edit as applicable ]---|
- Task-number: QTBUG-15428
- Reviewed-by: TBD
- # ==================================[ please wrap at 72 characters ]===|
- 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
- }
- diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
- index 65b8781..7827fb6 100644
- --- a/src/s60installs/s60installs.pro
- +++ b/src/s60installs/s60installs.pro
- @@ -87,7 +87,7 @@ symbian: {
- DEPLOYMENT += bearer_plugin
- }
- - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
- + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
- feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
- feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback
- DEPLOYMENT += feedback_plugin
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement