fix shared/static linkage detection and text codec auto-import for Qt4

The earlier approach was very convoluted and did not work for a static Qt5 build.
odoo · Jan 3, 2015 · 10d50bf · 10d50bf
1 parent a364164
commit 10d50bf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/common.pri b/common.pri
@@ -15,27 +15,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with wkhtmltopdf.  If not, see <http:#www.gnu.org/licenses/>.
 
-QT4_PRL = libQtGui.prl  QtGui.prl  QtGui.framework/QtGui.prl
-QT5_PRL = libQt5Gui.prl Qt5Gui.prl
-
-for(prl, QT4_PRL):exists($$[QT_INSTALL_LIBS]/$${prl}) {
-    include($$[QT_INSTALL_LIBS]/$${prl})
-    CONFIG += qt_gui_prl_found
-}
-for(prl, QT5_PRL):exists($$[QT_INSTALL_LIBS]/$${prl}) {
-    include($$[QT_INSTALL_LIBS]/$${prl})
-    CONFIG += qt_gui_prl_found
+CONFIG(static, shared|static):lessThan(QT_MAJOR_VERSION, 5) {
+    DEFINES  += QT4_STATICPLUGIN_TEXTCODECS
+    QTPLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
 }
 
-qt_gui_prl_found {
-    contains(QMAKE_PRL_CONFIG, static): DEFINES += QT_STATIC
-    else:                               DEFINES += QT_SHARED
-}
-contains(QMAKE_PRL_CONFIG, static): QTPLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
-
-# if we can't determine, assume that it is shared
-!qt_gui_prl_found: DEFINES += QT_SHARED
-
 INCLUDEPATH += ../../include
 RESOURCES    = $$PWD/wkhtmltopdf.qrc
 

diff --git a/src/image/image.pro b/src/image/image.pro
@@ -40,7 +40,7 @@ target.path=$$INSTALLBASE/bin
 
 include(../shared/shared.pri)
 
-contains(DEFINES, QT_SHARED) {
+CONFIG(shared, shared|static) {
   LIBS += -L../../bin -lwkhtmltox
 } else {
   include(../lib/lib.pri)

diff --git a/src/lib/converter.cc b/src/lib/converter.cc
@@ -24,7 +24,7 @@
 #include <QWebFrame>
 #include <qapplication.h>
 
-#ifdef QT_STATIC
+#ifdef QT4_STATICPLUGIN_TEXTCODECS
 #include <QtPlugin>
 Q_IMPORT_PLUGIN(qcncodecs)
 Q_IMPORT_PLUGIN(qjpcodecs)

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
@@ -22,7 +22,7 @@ include(../../common.pri)
 include(lib.pri)
 
 DEF_FILE = lib.def
-contains(QMAKE_PRL_CONFIG, static): DEFINES += QT_NODLL
+CONFIG(static, shared|static): DEFINES += QT_NODLL
 
 unix {
    headers.target=headers

diff --git a/src/pdf/pdf.pro b/src/pdf/pdf.pro
@@ -40,7 +40,7 @@ target.path=$$INSTALLBASE/bin
 
 include(../shared/shared.pri)
 
-contains(DEFINES, QT_SHARED) {
+CONFIG(shared, shared|static) {
   LIBS += -L../../bin -lwkhtmltox
 } else {
   include(../lib/lib.pri)