fix mingw-w64 build by removing the __WKHTMLTOX_UNDEF_QT_DLL__ hack

This was broken since cd6331b due to usage of QT resources. When building the library project, QT_DLL was being defined which caused linkage issues. Earlier, this was worked around by defining __WKHTMLTOX_UNDEF_QT_DLL__ which in turn caused QT_DLL to be undefined in each source file, but this does not work for the source file generated by rcc. A more sane approach is to simply define QT_NODLL in case of static builds, which ensures that QT_DLL is not defined at all via mkspecs/features/qt.prf
wkhtmltopdf · Apr 29, 2014 · c22928d · c22928d
1 parent d1dc688
commit c22928d
Show file tree

Hide file tree

Showing 36 changed files with 1 addition and 176 deletions.
diff --git a/src/lib/converter.cc b/src/lib/converter.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "converter_p.hh"
 #include "multipageloader.hh"

diff --git a/src/lib/converter.hh b/src/lib/converter.hh
@@ -20,11 +20,6 @@
 
 #ifndef __CONVERTER_HH__
 #define __CONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QObject>
 #include <wkhtmltox/loadsettings.hh>

diff --git a/src/lib/converter_p.hh b/src/lib/converter_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __CONVERTER_P_HH__
 #define __CONVERTER_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "converter.hh"
 #include "websettings.hh"

diff --git a/src/lib/image_c_bindings.cc b/src/lib/image_c_bindings.cc
@@ -41,11 +41,6 @@
  * - \b quality The compression factor to use when outputting a JPEG image. E.g. "94".
  */
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "image_c_bindings_p.hh"
 #include "pdf.h"

diff --git a/src/lib/image_c_bindings_p.hh b/src/lib/image_c_bindings_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __IMAGE_C_BINDINGS_P_HH__
 #define __IMAGE_C_BINDINGS_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "image.h"
 #include "imageconverter.hh"

diff --git a/src/lib/imageconverter.cc b/src/lib/imageconverter.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "imageconverter_p.hh"
 #include "imagesettings.hh"

diff --git a/src/lib/imageconverter.hh b/src/lib/imageconverter.hh
@@ -20,11 +20,6 @@
 
 #ifndef __IMAGECONVERTER_HH__
 #define __IMAGECONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/imagesettings.hh>

diff --git a/src/lib/imageconverter_p.hh b/src/lib/imageconverter_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __IMAGECONVERTER_P_HH__
 #define __IMAGECONVERTER_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "converter_p.hh"
 #include "imageconverter.hh"

diff --git a/src/lib/imagesettings.cc b/src/lib/imagesettings.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "imagesettings.hh"
 #include "reflect.hh"

diff --git a/src/lib/imagesettings.hh b/src/lib/imagesettings.hh
@@ -20,11 +20,6 @@
 
 #ifndef __IMAGESETTINGS_HH__
 #define __IMAGESETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QString>
 #include <wkhtmltox/loadsettings.hh>

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 += __WKHTMLTOX_UNDEF_QT_DLL__
+contains(QMAKE_PRL_CONFIG, static): DEFINES += QT_NODLL
 
 unix {
    headers.target=headers

diff --git a/src/lib/loadsettings.cc b/src/lib/loadsettings.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #ifdef _MSC_VER
 #define strcasecmp _stricmp

diff --git a/src/lib/loadsettings.hh b/src/lib/loadsettings.hh
@@ -20,11 +20,6 @@
 
 #ifndef __LOADSETTINGS_HH__
 #define __LOADSETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QNetworkProxy>
 #include <QString>

diff --git a/src/lib/multipageloader.cc b/src/lib/multipageloader.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "multipageloader_p.hh"
 #include <QFile>

diff --git a/src/lib/multipageloader.hh b/src/lib/multipageloader.hh
@@ -20,11 +20,6 @@
 
 #ifndef __MULTIPAGELOADER_HH__
 #define __MULTIPAGELOADER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QFile>
 #include <QObject>

diff --git a/src/lib/multipageloader_p.hh b/src/lib/multipageloader_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __MULTIPAGELOADER_P_HH__
 #define __MULTIPAGELOADER_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "multipageloader.hh"
 #include "tempfile.hh"

diff --git a/src/lib/outline.cc b/src/lib/outline.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "outline_p.hh"
 #include <fstream>

diff --git a/src/lib/outline.hh b/src/lib/outline.hh
@@ -20,11 +20,6 @@
 
 #ifndef __OUTLINE_HH__
 #define __OUTLINE_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "pdfsettings.hh"
 #include <QWebElement>

diff --git a/src/lib/outline_p.hh b/src/lib/outline_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __OUTLINE_P_HH__
 #define __OUTLINE_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "outline.hh"
 #ifdef __EXTENSIVE_WKHTMLTOPDF_QT_HACK__

diff --git a/src/lib/pdf_c_bindings.cc b/src/lib/pdf_c_bindings.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 /**
  * \file pdf.h

diff --git a/src/lib/pdf_c_bindings_p.hh b/src/lib/pdf_c_bindings_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __PDF_C_BINDINGS_P_HH__
 #define __PDF_C_BINDINGS_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "pdf.h"
 #include "pdfconverter.hh"

diff --git a/src/lib/pdfconverter.cc b/src/lib/pdfconverter.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "pdfconverter_p.hh"
 #include <QAuthenticator>

diff --git a/src/lib/pdfconverter.hh b/src/lib/pdfconverter.hh
@@ -20,11 +20,6 @@
 
 #ifndef __PDFCONVERTER_HH__
 #define __PDFCONVERTER_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <wkhtmltox/converter.hh>
 #include <wkhtmltox/pdfsettings.hh>

diff --git a/src/lib/pdfconverter_p.hh b/src/lib/pdfconverter_p.hh
@@ -20,11 +20,6 @@
 
 #ifndef __PDFCONVERTER_P_HH__
 #define __PDFCONVERTER_P_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "converter_p.hh"
 #include "multipageloader.hh"

diff --git a/src/lib/pdfsettings.cc b/src/lib/pdfsettings.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #ifdef _MSC_VER
 #define strcasecmp _stricmp

diff --git a/src/lib/pdfsettings.hh b/src/lib/pdfsettings.hh
@@ -20,11 +20,6 @@
 
 #ifndef __PDFSETTINGS_HH__
 #define __PDFSETTINGS_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QNetworkProxy>
 #include <QPrinter>

diff --git a/src/lib/refcount.hh b/src/lib/refcount.hh
@@ -21,11 +21,6 @@
 #ifndef __REFCOUNT_HH__
 #define __REFCOUNT_HH__
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <wkhtmltox/dllbegin.inc>
 

diff --git a/src/lib/reflect.cc b/src/lib/reflect.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "reflect.hh"
 

diff --git a/src/lib/reflect.hh b/src/lib/reflect.hh
@@ -20,11 +20,6 @@
 
 #ifndef __REFLECT_HH__
 #define __REFLECT_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #if defined(_MSC_VER) && _MSC_VER == 1500
 namespace msvc_typeof_impl {

diff --git a/src/lib/tempfile.cc b/src/lib/tempfile.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "tempfile.hh"
 #include <QDir>

diff --git a/src/lib/tempfile.hh b/src/lib/tempfile.hh
@@ -20,11 +20,6 @@
 
 #ifndef __TEMPFILE_HH__
 #define __TEMPFILE_HH__
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include <QString>
 

diff --git a/src/lib/tocstylesheet.cc b/src/lib/tocstylesheet.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "outline_p.hh"
 #include "pdfsettings.hh"

diff --git a/src/lib/utilities.cc b/src/lib/utilities.cc
@@ -18,11 +18,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with wkhtmltopdf.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifdef __WKHTMLTOX_UNDEF_QT_DLL__
-#ifdef QT_DLL
-#undef QT_DLL
-#endif
-#endif
 
 #include "utilities.hh"
 #include <QDebug>