qpdfview

Merge lp:~djcj/qpdfview/qmake-patch into lp:qpdfview

  1. qmake-patch
  2. Merge into trunk
Proposed by djcj
Status: Merged
Approved by: Adam Reichold
Approved revision: 2076
Merged at revision: 2076
Proposed branch: lp:~djcj/qpdfview/qmake-patch
Merge into: lp:qpdfview
Diff against target: 92 lines (+10/-10)
1 file modified
application.pro (+10/-10)
To merge this branch: bzr merge lp:~djcj/qpdfview/qmake-patch
Reviewer Review Type Date Requested Status
Adam Reichold Approve
Review via email: mp+346768@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Adam Reichold (adamreichold) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'application.pro'
2--- application.pro 2018-05-13 17:09:14 +0000
3+++ application.pro 2018-05-23 18:44:25 +0000
4@@ -107,7 +107,7 @@
5 DEFINES += POPPLER_VERSION=\\\"$${POPPLER_VERSION}\\\"
6
7 static_pdf_plugin {
8- isEmpty(PDF_PLUGIN_NAME):PDF_PLUGIN_NAME = libqpdfview_pdf.a
9+ isEmpty(PDF_PLUGIN_NAME):PDF_PLUGIN_NAME = $${QMAKE_PREFIX_STATICLIB}qpdfview_pdf.$${QMAKE_EXTENSION_STATICLIB}
10
11 DEFINES += STATIC_PDF_PLUGIN
12 LIBS += $$PDF_PLUGIN_NAME $$PDF_PLUGIN_LIBS
13@@ -120,7 +120,7 @@
14 PKGCONFIG += poppler-qt$${QT_MAJOR_VERSION}
15 }
16 } else {
17- isEmpty(PDF_PLUGIN_NAME):PDF_PLUGIN_NAME = libqpdfview_pdf.so
18+ isEmpty(PDF_PLUGIN_NAME):PDF_PLUGIN_NAME = $${QMAKE_PREFIX_SHLIB}qpdfview_pdf.$${QMAKE_EXTENSION_SHLIB}
19 }
20
21 DEFINES += PDF_PLUGIN_NAME=\\\"$${PDF_PLUGIN_NAME}\\\"
22@@ -133,7 +133,7 @@
23 DEFINES += LIBSPECTRE_VERSION=\\\"$${LIBSPECTRE_VERSION}\\\"
24
25 static_ps_plugin {
26- isEmpty(PS_PLUGIN_NAME):PS_PLUGIN_NAME = libqpdfview_ps.a
27+ isEmpty(PS_PLUGIN_NAME):PS_PLUGIN_NAME = $${QMAKE_PREFIX_STATICLIB}qpdfview_ps.$${QMAKE_EXTENSION_STATICLIB}
28
29 DEFINES += STATIC_PS_PLUGIN
30 LIBS += $$PS_PLUGIN_NAME $$PS_PLUGIN_LIBS
31@@ -144,7 +144,7 @@
32 PKGCONFIG += libspectre
33 }
34 } else {
35- isEmpty(PS_PLUGIN_NAME):PS_PLUGIN_NAME = libqpdfview_ps.so
36+ isEmpty(PS_PLUGIN_NAME):PS_PLUGIN_NAME = $${QMAKE_PREFIX_SHLIB}qpdfview_ps.$${QMAKE_EXTENSION_SHLIB}
37 }
38
39 DEFINES += PS_PLUGIN_NAME=\\\"$${PS_PLUGIN_NAME}\\\"
40@@ -157,7 +157,7 @@
41 DEFINES += DJVULIBRE_VERSION=\\\"$${DJVULIBRE_VERSION}\\\"
42
43 static_djvu_plugin {
44- isEmpty(DJVU_PLUGIN_NAME):DJVU_PLUGIN_NAME = libqpdfview_djvu.a
45+ isEmpty(DJVU_PLUGIN_NAME):DJVU_PLUGIN_NAME = $${QMAKE_PREFIX_STATICLIB}qpdfview_djvu.$${QMAKE_EXTENSION_STATICLIB}
46
47 DEFINES += STATIC_DJVU_PLUGIN
48 LIBS += $$DJVU_PLUGIN_NAME $$DJVU_PLUGIN_LIBS
49@@ -168,7 +168,7 @@
50 PKGCONFIG += ddjvuapi
51 }
52 } else {
53- isEmpty(DJVU_PLUGIN_NAME):DJVU_PLUGIN_NAME = libqpdfview_djvu.so
54+ isEmpty(DJVU_PLUGIN_NAME):DJVU_PLUGIN_NAME = $${QMAKE_PREFIX_SHLIB}qpdfview_djvu.$${QMAKE_EXTENSION_SHLIB}
55 }
56
57 DEFINES += DJVU_PLUGIN_NAME=\\\"$${DJVU_PLUGIN_NAME}\\\"
58@@ -180,7 +180,7 @@
59 DEFINES += FITZ_VERSION=\\\"$${FITZ_VERSION}\\\"
60
61 static_fitz_plugin {
62- isEmpty(FITZ_PLUGIN_NAME):FITZ_PLUGIN_NAME = libqpdfview_fitz.a
63+ isEmpty(FITZ_PLUGIN_NAME):FITZ_PLUGIN_NAME = $${QMAKE_PREFIX_STATICLIB}qpdfview_fitz.$${QMAKE_EXTENSION_STATICLIB}
64
65 DEFINES += STATIC_FITZ_PLUGIN
66 LIBS += $$FITZ_PLUGIN_NAME $$FITZ_PLUGIN_LIBS
67@@ -192,7 +192,7 @@
68 LIBS += $$FITZ_PLUGIN_LIBS
69 }
70 } else {
71- isEmpty(FITZ_PLUGIN_NAME):FITZ_PLUGIN_NAME = libqpdfview_fitz.so
72+ isEmpty(FITZ_PLUGIN_NAME):FITZ_PLUGIN_NAME = $${QMAKE_PREFIX_SHLIB}qpdfview_fitz.$${QMAKE_EXTENSION_SHLIB}
73 }
74
75 DEFINES += FITZ_PLUGIN_NAME=\\\"$${FITZ_PLUGIN_NAME}\\\"
76@@ -202,14 +202,14 @@
77 DEFINES += WITH_IMAGE
78
79 static_image_plugin {
80- isEmpty(IMAGE_PLUGIN_NAME):IMAGE_PLUGIN_NAME = libqpdfview_image.a
81+ isEmpty(IMAGE_PLUGIN_NAME):IMAGE_PLUGIN_NAME = $${QMAKE_PREFIX_STATICLIB}qpdfview_image.$${QMAKE_EXTENSION_STATICLIB}
82
83 DEFINES += STATIC_IMAGE_PLUGIN
84 LIBS += $$IMAGE_PLUGIN_NAME $$IMAGE_PLUGIN_LIBS
85 PRE_TARGETDEPS += $$IMAGE_PLUGIN_NAME
86 }
87 else {
88- isEmpty(IMAGE_PLUGIN_NAME):IMAGE_PLUGIN_NAME = libqpdfview_image.so
89+ isEmpty(IMAGE_PLUGIN_NAME):IMAGE_PLUGIN_NAME = $${QMAKE_PREFIX_SHLIB}qpdfview_image.$${QMAKE_EXTENSION_SHLIB}
90 }
91
92 DEFINES += IMAGE_PLUGIN_NAME=\\\"$${IMAGE_PLUGIN_NAME}\\\"

Subscribers

People subscribed via source and target branches

to all changes: