added poppler-qt5 for Qt5 build (only for windows)

This commit is contained in:
Luis Ángel San Martín
2013-11-21 08:14:14 +01:00
parent 65461bf72d
commit f8dff1390f
43 changed files with 5241 additions and 6 deletions

View File

@ -16,8 +16,19 @@ INCLUDEPATH += ../common \
DEFINES += SERVER_RELEASE NOMINMAX
win32 {
INCLUDEPATH += ../dependencies/poppler/include
LIBS += -L../dependencies/poppler/lib -lpoppler-qt4 -loleaut32 -lole32
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32
isEqual(QT_MAJOR_VERSION, 5) {
LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5
}
else
{
LIBS += -lpoppler-qt4
INCLUDEPATH += ../dependencies/poppler/include/qt4
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe

View File

@ -17,7 +17,11 @@
#include <algorithm>
using namespace std;
#include "poppler-qt4.h"
#if QT_VERSION >= 0x050000
#include "poppler-qt5.h"
#else
#include "poppler-qt4.h"
#endif
//--------------------------------------------------------------------------------
LibraryCreator::LibraryCreator()