Advertisement
Guest User

Untitled

a guest
Jul 23rd, 2017
65
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.00 KB | None | 0 0
  1. diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
  2. index 08cd506..49bdeee 100644
  3. --- a/tools/qml/qml.pri
  4. +++ b/tools/qml/qml.pri
  5. @@ -19,29 +19,16 @@ SOURCES += $$PWD/qmlruntime.cpp \
  6.  RESOURCES = $$PWD/browser/browser.qrc \
  7.              $$PWD/startup/startup.qrc
  8.  
  9. -symbian: {
  10. -    contains(QT_CONFIG, s60): {
  11. -        LIBS += -lavkon -lcone
  12. -    }
  13. -    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  14. -        LIBS += -lsensrvclient -lsensrvutil
  15. -    }
  16. -    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2): {
  17. -        SOURCES += $$PWD/deviceorientation_symbian.cpp
  18. -        FORMS = $$PWD/recopts.ui \
  19. -                     $$PWD/proxysettings.ui
  20. -    }
  21. +symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  22. +   SOURCES += $$PWD/deviceorientation_symbian.cpp
  23. +   FORMS = $$PWD/recopts.ui \
  24. +           $$PWD/proxysettings.ui
  25.  } else:maemo5 {
  26.      QT += dbus
  27.      HEADERS += $$PWD/texteditautoresizer_maemo5.h
  28.      SOURCES += $$PWD/deviceorientation_maemo5.cpp
  29.      FORMS = $$PWD/recopts_maemo5.ui \
  30.              $$PWD/proxysettings_maemo5.ui
  31. -} else:linux-g++-maemo {
  32. -    QT += dbus
  33. -    SOURCES += $$PWD/deviceorientation_harmattan.cpp
  34. -    FORMS = $$PWD/recopts.ui \
  35. -            $$PWD/proxysettings.ui
  36.  } else {
  37.      SOURCES += $$PWD/deviceorientation.cpp
  38.      FORMS = $$PWD/recopts.ui \
  39. diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
  40. index b1d56ea..4416160 100644
  41. --- a/tools/qml/qml.pro
  42. +++ b/tools/qml/qml.pro
  43. @@ -37,11 +37,9 @@ symbian {
  44.      include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
  45.      TARGET.EPOCHEAPSIZE = 0x20000 0x4000000
  46.      TARGET.CAPABILITY = NetworkServices ReadUserData
  47. -
  48. -    # Deploy plugin for remote debugging
  49. -    qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
  50. -    qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
  51. -    DEPLOYMENT +=  qmldebuggingplugin
  52. +    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
  53. +        LIBS += -lsensrvclient -lsensrvutil
  54. +    }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement