Link with text codec plugins on mac and linux

Fixes [#10249](https://github.com/ariya/phantomjs/issues/10249)
1.x
execjosh 2013-03-26 17:36:19 +09:00 committed by Ariya Hidayat
parent d925a510d9
commit f8a905c8b0
3 changed files with 17 additions and 3 deletions

View File

@ -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 File

@ -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 File

@ -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