API tools faq
paste
kenya888

Untitled

kenya888
Jan 16th, 2014
133
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.48 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/examples/messagingaccounts/messagingaccounts.pro b/examples/messagingaccounts/messagingaccounts.pro
  2. index 09de123..c3bb6bd 100644
  3. --- a/examples/messagingaccounts/messagingaccounts.pro
  4. +++ b/examples/messagingaccounts/messagingaccounts.pro
  5. @@ -4,12 +4,22 @@ CONFIG += qmfclient qmfmessageserver
  6.  
  7.  equals(QT_MAJOR_VERSION, 4){
  8.      TARGET = messagingaccounts
  9. -    LIBS += -lqmfmessageserver -lqmfclient
  10. +
  11. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  12. +        LIBS += -framework qmfmessageserver -framework qmfclient
  13. +    } else {
  14. +        LIBS += -lqmfmessageserver -lqmfclient
  15. +    }
  16.  }
  17.  equals(QT_MAJOR_VERSION, 5){
  18.      TARGET = messagingaccounts5
  19.      QT += widgets
  20. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  21. +
  22. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  23. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  24. +    } else {
  25. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  26. +    }
  27.  }
  28.  
  29.  DEPENDPATH += .
  30. diff --git a/examples/qtmail/app/app.pro b/examples/qtmail/app/app.pro
  31. index b81d9e2..a9625dd 100644
  32. --- a/examples/qtmail/app/app.pro
  33. +++ b/examples/qtmail/app/app.pro
  34. @@ -2,12 +2,21 @@ TEMPLATE = app
  35.  
  36.  equals(QT_MAJOR_VERSION, 4){
  37.      TARGET = qtmail
  38. -    LIBS += -lqmfmessageserver -lqmfclient -lqmfutil
  39. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  40. +        LIBS += -framework qmfmessageserver -framework qmfclient -framework qmfutil
  41. +    } else {
  42. +        LIBS += -lqmfmessageserver -lqmfclient -lqmfutil
  43. +    }
  44.  }
  45.  equals(QT_MAJOR_VERSION, 5){
  46.      TARGET = qtmail5
  47.      QT += widgets
  48. -    LIBS += -lqmfmessageserver5 -lqmfclient5 -lqmfutil5
  49. +
  50. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  51. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5 -framework qmfutil5
  52. +    } else {
  53. +        LIBS += -lqmfmessageserver5 -lqmfclient5 -lqmfutil5
  54. +    }
  55.  }
  56.  
  57.  CONFIG += qmfutil qmfclient qmfmessageserver
  58. diff --git a/examples/qtmail/libs/qmfutil/qmfutil.pro b/examples/qtmail/libs/qmfutil/qmfutil.pro
  59. index 9fef6ba..5c9e5a3 100644
  60. --- a/examples/qtmail/libs/qmfutil/qmfutil.pro
  61. +++ b/examples/qtmail/libs/qmfutil/qmfutil.pro
  62. @@ -3,12 +3,20 @@ CONFIG += warn_on
  63.  CONFIG += qmfclient
  64.  equals(QT_MAJOR_VERSION, 4) {
  65.      TARGET = qmfutil
  66. -    LIBS += -lqmfclient
  67. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  68. +        LIBS += -framework qmfclient
  69. +    } else {
  70. +        LIBS += -lqmfclient
  71. +    }
  72.  }
  73.  equals(QT_MAJOR_VERSION, 5){
  74.      TARGET = qmfutil5
  75.      QT += widgets
  76. -    LIBS += -lqmfclient5
  77. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  78. +        LIBS += -framework qmfclient5
  79. +    } else {
  80. +        LIBS += -lqmfclient5
  81. +    }
  82.  }
  83.  target.path += $$QMF_INSTALL_ROOT/lib
  84.  
  85. diff --git a/examples/qtmail/plugins/composers/email/email.pro b/examples/qtmail/plugins/composers/email/email.pro
  86. index 9528b2c..4bbd36f 100644
  87. --- a/examples/qtmail/plugins/composers/email/email.pro
  88. +++ b/examples/qtmail/plugins/composers/email/email.pro
  89. @@ -4,12 +4,20 @@ CONFIG += qmfclient qmfutil plugin
  90.  
  91.  equals(QT_MAJOR_VERSION, 4) {
  92.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/composers
  93. -    LIBS += -lqmfclient -lqmfutil
  94. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  95. +        LIBS += -framework qmfclient -framework qmfutil
  96. +    } else {
  97. +        LIBS += -lqmfclient -lqmfutil
  98. +    }
  99.  }
  100.  equals(QT_MAJOR_VERSION, 5) {
  101.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/composers
  102.      QT += widgets
  103. -    LIBS += -lqmfclient5 -lqmfutil5
  104. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  105. +        LIBS += -framework qmfclient5 -framework qmfutil5
  106. +    } else {
  107. +        LIBS += -lqmfclient5 -lqmfutil5
  108. +    }
  109.  }
  110.  
  111.  DEFINES += PLUGIN_INTERNAL
  112. diff --git a/examples/qtmail/plugins/viewers/generic/generic.pro b/examples/qtmail/plugins/viewers/generic/generic.pro
  113. index e5d4541..6ba7977 100644
  114. --- a/examples/qtmail/plugins/viewers/generic/generic.pro
  115. +++ b/examples/qtmail/plugins/viewers/generic/generic.pro
  116. @@ -4,12 +4,20 @@ CONFIG += qmfclient qmfutil plugin
  117.  
  118.  equals(QT_MAJOR_VERSION, 4) {
  119.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/viewers
  120. -    LIBS += -lqmfclient -lqmfutil
  121. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  122. +        LIBS += -framework qmfclient -framework qmfutil
  123. +    } else {
  124. +        LIBS += -lqmfclient -lqmfutil
  125. +    }
  126.  }
  127.  equals(QT_MAJOR_VERSION, 5) {
  128.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/viewers
  129.      QT += widgets
  130. -    LIBS += -lqmfclient5 -lqmfutil5
  131. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  132. +        LIBS += -framework qmfclient5 -framework qmfutil5
  133. +    } else {
  134. +        LIBS += -lqmfclient5 -lqmfutil5
  135. +    }
  136.  }
  137.  
  138.  # Use webkit to render mail if available
  139. diff --git a/examples/serverobserver/serverobserver.pro b/examples/serverobserver/serverobserver.pro
  140. index 32d47ea..8374703 100644
  141. --- a/examples/serverobserver/serverobserver.pro
  142. +++ b/examples/serverobserver/serverobserver.pro
  143. @@ -2,12 +2,20 @@ TEMPLATE = app
  144.  
  145.  equals(QT_MAJOR_VERSION, 4){
  146.      TARGET = serverobserver
  147. -    LIBS += -lqmfmessageserver -lqmfclient
  148. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  149. +        LIBS += -framework qmfmessageserver -framework qmfclient
  150. +    } else {
  151. +        LIBS += -lqmfmessageserver -lqmfclient
  152. +    }
  153.  }
  154.  equals(QT_MAJOR_VERSION, 5){
  155.      TARGET = serverobserver5
  156.      QT += widgets
  157. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  158. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  159. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  160. +    } else {
  161. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  162. +    }
  163.  }
  164.  
  165.  target.path += $$QMF_INSTALL_ROOT/bin
  166. diff --git a/src/libraries/qmfmessageserver/qmfmessageserver.pro b/src/libraries/qmfmessageserver/qmfmessageserver.pro
  167. index 768b5e6..7f04698 100644
  168. --- a/src/libraries/qmfmessageserver/qmfmessageserver.pro
  169. +++ b/src/libraries/qmfmessageserver/qmfmessageserver.pro
  170. @@ -4,11 +4,19 @@ CONFIG += qmfclient
  171.  
  172.  equals(QT_MAJOR_VERSION, 4){
  173.      TARGET = qmfmessageserver
  174. -    LIBS += -lqmfclient
  175. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  176. +        LIBS += -framework qmfclient
  177. +    } else {
  178. +        LIBS += -lqmfclient
  179. +    }
  180.  }
  181.  equals(QT_MAJOR_VERSION, 5){
  182.      TARGET = qmfmessageserver5
  183. -    LIBS += -lqmfclient5
  184. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  185. +        LIBS += -framework qmfclient5
  186. +    } else {
  187. +        LIBS += -lqmfclient5
  188. +    }
  189.  }
  190.  target.path += $$QMF_INSTALL_ROOT/lib
  191.  
  192. diff --git a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
  193. index 91eae0c..64f45f5 100644
  194. --- a/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
  195. +++ b/src/plugins/contentmanagers/qmfstoragemanager/qmfstoragemanager.pro
  196. @@ -5,11 +5,19 @@ QT = core
  197.  
  198.  equals(QT_MAJOR_VERSION, 4) {
  199.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/contentmanagers
  200. -    LIBS += -lqmfclient
  201. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  202. +        LIBS += -framework qmfclient
  203. +    } else {
  204. +        LIBS += -lqmfclient
  205. +    }
  206.  }
  207.  equals(QT_MAJOR_VERSION, 5) {
  208.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/contentmanagers
  209. -    LIBS += -lqmfclient5
  210. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  211. +        LIBS += -framework qmfclient5
  212. +    } else {
  213. +        LIBS += -lqmfclient5
  214. +    }
  215.  }
  216.  
  217.  DEFINES += PLUGIN_INTERNAL
  218. diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro
  219. index 7aca1b2..657f456 100644
  220. --- a/src/plugins/messageservices/imap/imap.pro
  221. +++ b/src/plugins/messageservices/imap/imap.pro
  222. @@ -4,11 +4,19 @@ CONFIG += qmfmessageserver qmfclient plugin
  223.  
  224.  equals(QT_MAJOR_VERSION, 4) {
  225.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
  226. -    LIBS += -lqmfmessageserver -lqmfclient
  227. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  228. +        LIBS += -framework qmfmessageserver -framework qmfclient
  229. +    } else {
  230. +        LIBS += -lqmfmessageserver -lqmfclient
  231. +    }
  232.  }
  233.  equals(QT_MAJOR_VERSION, 5) {
  234.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/messageservices
  235. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  236. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  237. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  238. +    } else {
  239. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  240. +    }
  241.  }
  242.  
  243.  QT = core network
  244. diff --git a/src/plugins/messageservices/pop/pop.pro b/src/plugins/messageservices/pop/pop.pro
  245. index 23e21a3..53bb954 100644
  246. --- a/src/plugins/messageservices/pop/pop.pro
  247. +++ b/src/plugins/messageservices/pop/pop.pro
  248. @@ -4,11 +4,19 @@ CONFIG += qmfclient qmfmessageserver plugin
  249.  
  250.  equals(QT_MAJOR_VERSION, 4) {
  251.      target.path = $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
  252. -    LIBS += -lqmfmessageserver -lqmfclient
  253. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  254. +        LIBS += -framework qmfmessageserver -framework qmfclient
  255. +    } else {
  256. +        LIBS += -lqmfmessageserver -lqmfclient
  257. +    }
  258.  }
  259.  equals(QT_MAJOR_VERSION, 5) {
  260.      target.path = $$QMF_INSTALL_ROOT/lib/qmf/plugins5/messageservices
  261. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  262. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  263. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  264. +    } else {
  265. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  266. +    }
  267.  }
  268.  
  269.  QT = core network
  270. diff --git a/src/plugins/messageservices/qmfsettings/qmfsettings.pro b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
  271. index 87a9f44..2132ba4 100644
  272. --- a/src/plugins/messageservices/qmfsettings/qmfsettings.pro
  273. +++ b/src/plugins/messageservices/qmfsettings/qmfsettings.pro
  274. @@ -4,11 +4,19 @@ CONFIG += qmfclient qmfmessageserver plugin
  275.  
  276.  equals(QT_MAJOR_VERSION, 4) {
  277.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
  278. -    LIBS += -lqmfclient -lqmfmessageserver
  279. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  280. +        LIBS += -framework qmfclient -framework qmfmessageserver
  281. +    } else {
  282. +        LIBS += -lqmfclient -lqmfmessageserver
  283. +    }
  284.  }
  285.  equals(QT_MAJOR_VERSION, 5) {
  286.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/messageservices
  287. -    LIBS += -lqmfclient5 -lqmfmessageserver5
  288. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  289. +        LIBS += -framework qmfclient5 -framework qmfmessageserver5
  290. +    } else {
  291. +        LIBS += -lqmfclient5 -lqmfmessageserver5
  292. +    }
  293.  }
  294.  
  295.  QT = core network
  296. diff --git a/src/plugins/messageservices/smtp/smtp.pro b/src/plugins/messageservices/smtp/smtp.pro
  297. index aacaffc..ad1bbcc 100644
  298. --- a/src/plugins/messageservices/smtp/smtp.pro
  299. +++ b/src/plugins/messageservices/smtp/smtp.pro
  300. @@ -4,11 +4,19 @@ TARGET = smtp
  301.  CONFIG += qmfclient qmfmessageserver plugin
  302.  equals(QT_MAJOR_VERSION, 4) {
  303.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins/messageservices
  304. -    LIBS += -lqmfmessageserver -lqmfclient
  305. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  306. +        LIBS += -framework qmfmessageserver -framework qmfclient
  307. +    } else {
  308. +        LIBS += -lqmfmessageserver -lqmfclient
  309. +    }
  310.  }
  311.  equals(QT_MAJOR_VERSION, 5) {
  312.      target.path += $$QMF_INSTALL_ROOT/lib/qmf/plugins5/messageservices
  313. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  314. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  315. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  316. +    } else {
  317. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  318. +    }
  319.  }
  320.  
  321.  QT = core network
  322. diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
  323. index e4202bb..8a82b0c 100644
  324. --- a/src/tools/messageserver/messageserver.pro
  325. +++ b/src/tools/messageserver/messageserver.pro
  326. @@ -8,11 +8,19 @@ SERVER_AS_DLL: {
  327.  
  328.  equals(QT_MAJOR_VERSION, 4){
  329.      TARGET = messageserver
  330. -    LIBS += -lqmfmessageserver -lqmfclient
  331. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  332. +        LIBS += -framework qmfmessageserver -framework qmfclient
  333. +    } else {
  334. +        LIBS += -lqmfmessageserver -lqmfclient
  335. +    }
  336.  }
  337.  equals(QT_MAJOR_VERSION, 5){
  338.      TARGET = messageserver5
  339. -    LIBS += -lqmfmessageserver5 -lqmfclient5
  340. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  341. +        LIBS += -framework qmfmessageserver5 -framework qmfclient5
  342. +    } else {
  343. +        LIBS += -lqmfmessageserver5 -lqmfclient5
  344. +    }
  345.  }
  346.  
  347.  CONFIG += qmfmessageserver qmfclient
  348. diff --git a/tests/tests.pri b/tests/tests.pri
  349. index a3a4ec4..647fed4 100644
  350. --- a/tests/tests.pri
  351. +++ b/tests/tests.pri
  352. @@ -7,11 +7,19 @@ macx {
  353.  }
  354.  
  355.  equals(QT_MAJOR_VERSION, 4){
  356. -    LIBS += -lqmfclient
  357. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  358. +        LIBS += -framework qmfclient
  359. +    } else {
  360. +        LIBS += -lqmfclient
  361. +    }
  362.      target.path += $$QMF_INSTALL_ROOT/tests
  363.  }
  364.  equals(QT_MAJOR_VERSION, 5){
  365. -    LIBS += -lqmfclient5
  366. +    if(macx:contains(QT_CONFIG, qt_framework)) {
  367. +        LIBS += -framework qmfclient5
  368. +    } else {
  369. +        LIBS += -lqmfclient5
  370. +    }
  371.      target.path += $$QMF_INSTALL_ROOT/tests5
  372.  }
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!