mirror of https://github.com/vitalif/phantomjs
Link with text codec plugins on mac and linux
Fixes [#10249](https://github.com/ariya/phantomjs/issues/10249)1.x
parent
d925a510d9
commit
f8a905c8b0
|
@ -42,9 +42,6 @@
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QSslSocket>
|
#include <QSslSocket>
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
using namespace google_breakpad;
|
|
||||||
static google_breakpad::ExceptionHandler* eh;
|
|
||||||
#if !defined(QT_SHARED) && !defined(QT_DLL)
|
#if !defined(QT_SHARED) && !defined(QT_DLL)
|
||||||
#include <QtPlugin>
|
#include <QtPlugin>
|
||||||
|
|
||||||
|
@ -52,6 +49,12 @@ Q_IMPORT_PLUGIN(qcncodecs)
|
||||||
Q_IMPORT_PLUGIN(qjpcodecs)
|
Q_IMPORT_PLUGIN(qjpcodecs)
|
||||||
Q_IMPORT_PLUGIN(qkrcodecs)
|
Q_IMPORT_PLUGIN(qkrcodecs)
|
||||||
Q_IMPORT_PLUGIN(qtwcodecs)
|
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)
|
Q_IMPORT_PLUGIN(qico)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -67,6 +67,12 @@ linux*|mac {
|
||||||
breakpad/src/common/convert_UTF.c \
|
breakpad/src/common/convert_UTF.c \
|
||||||
breakpad/src/common/md5.cc \
|
breakpad/src/common/md5.cc \
|
||||||
breakpad/src/common/string_conversion.cc
|
breakpad/src/common/string_conversion.cc
|
||||||
|
|
||||||
|
QTPLUGIN += \
|
||||||
|
qcncodecs \
|
||||||
|
qjpcodecs \
|
||||||
|
qkrcodecs \
|
||||||
|
qtwcodecs
|
||||||
}
|
}
|
||||||
|
|
||||||
linux* {
|
linux* {
|
||||||
|
|
|
@ -108,3 +108,8 @@ export MAKEFLAGS=-j$COMPILE_JOBS
|
||||||
|
|
||||||
./configure -prefix $PWD $QT_CFG
|
./configure -prefix $PWD $QT_CFG
|
||||||
make -j$COMPILE_JOBS
|
make -j$COMPILE_JOBS
|
||||||
|
|
||||||
|
# Build text codecs
|
||||||
|
pushd src/plugins/codecs/
|
||||||
|
make -j$COMPILE_JOBS
|
||||||
|
popd
|
||||||
|
|
Loading…
Reference in New Issue