Skip to content
Browse files

Link with text codec plugins on mac and linux

  • Loading branch information...
1 parent d925a51 commit f8a905c8b0d2a08e0798a6341b2d8dd39eeb2cdb @execjosh committed with ariya
Showing with 17 additions and 3 deletions.
  1. +6 −3 src/main.cpp
  2. +6 −0 src/phantomjs.pro
  3. +5 −0 src/qt/preconfig.sh
View
9 src/main.cpp
@@ -42,9 +42,6 @@
#include <QApplication>
#include <QSslSocket>
-#ifdef Q_OS_WIN32
-using namespace google_breakpad;
-static google_breakpad::ExceptionHandler* eh;
#if !defined(QT_SHARED) && !defined(QT_DLL)
#include <QtPlugin>
@@ -52,6 +49,12 @@ Q_IMPORT_PLUGIN(qcncodecs)
Q_IMPORT_PLUGIN(qjpcodecs)
Q_IMPORT_PLUGIN(qkrcodecs)
Q_IMPORT_PLUGIN(qtwcodecs)
+#endif
+
+#ifdef Q_OS_WIN32
+using namespace google_breakpad;
+static google_breakpad::ExceptionHandler* eh;
+#if !defined(QT_SHARED) && !defined(QT_DLL)
Q_IMPORT_PLUGIN(qico)
#endif
#endif
View
6 src/phantomjs.pro
@@ -67,6 +67,12 @@ linux*|mac {
breakpad/src/common/convert_UTF.c \
breakpad/src/common/md5.cc \
breakpad/src/common/string_conversion.cc
+
+ QTPLUGIN += \
+ qcncodecs \
+ qjpcodecs \
+ qkrcodecs \
+ qtwcodecs
}
linux* {
View
5 src/qt/preconfig.sh
@@ -108,3 +108,8 @@ export MAKEFLAGS=-j$COMPILE_JOBS
./configure -prefix $PWD $QT_CFG
make -j$COMPILE_JOBS
+
+# Build text codecs
+pushd src/plugins/codecs/
+make -j$COMPILE_JOBS
+popd

0 comments on commit f8a905c

Please sign in to comment.
Something went wrong with that request. Please try again.