Advertisement
Guest User

Untitled

a guest
Jun 28th, 2017
65
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.18 KB | None | 0 0
  1. # ===[ Subject ]==========[ one line, please wrap at 72 characters ]===|
  2. Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
  3. # ---[ Details ]---------[ remember extra blank line after subject ]---|
  4.  
  5. Due to somewhat questionable .pro-file flagging, the plugin is not
  6. currently compiled at all for latest Sym^3 environments.
  7.  
  8. Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
  9. upcoming platform versions change, this should work in the future.
  10.  
  11. # ---[ Fields ]-----------------[ uncomment and edit as applicable ]---|
  12.  
  13. Task-number: QTBUG-15428
  14. Reviewed-by: TBD
  15.  
  16. # ==================================[ please wrap at 72 characters ]===|
  17.  
  18.  
  19. diff --git a/src/plugins/s60/feedback/feedback.pro b/src/plugins/s60/feedback/feedback.pro
  20. index 1069220..5e577ec 100644
  21. --- a/src/plugins/s60/feedback/feedback.pro
  22. +++ b/src/plugins/s60/feedback/feedback.pro
  23. @@ -6,7 +6,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60/feedback
  24.  
  25. INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
  26.  
  27. -contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
  28. +!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  29. HEADERS += qtactileFeedback.h
  30. SOURCES += qtactileFeedback_s60.cpp
  31.  
  32. diff --git a/src/plugins/s60/s60.pro b/src/plugins/s60/s60.pro
  33. index ffcd170..1ddf326 100644
  34. --- a/src/plugins/s60/s60.pro
  35. +++ b/src/plugins/s60/s60.pro
  36. @@ -6,7 +6,7 @@ symbian {
  37. SUBDIRS += 3_1 3_2
  38. }
  39.  
  40. - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
  41. + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  42. SUBDIRS += feedback
  43. }
  44.  
  45. diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
  46. index 65b8781..7827fb6 100644
  47. --- a/src/s60installs/s60installs.pro
  48. +++ b/src/s60installs/s60installs.pro
  49. @@ -87,7 +87,7 @@ symbian: {
  50. DEPLOYMENT += bearer_plugin
  51. }
  52.  
  53. - contains(S60_VERSION, 5.0)|contains(S60_VERSION, symbian3) {
  54. + !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  55. feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll
  56. feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback
  57. DEPLOYMENT += feedback_plugin
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement