merge develop

This commit is contained in:
Felix Kauselmann
2018-02-12 21:41:46 +01:00
parent d99a6cb44f
commit 601e70fc85
2 changed files with 35 additions and 28 deletions

View File

@ -1,8 +1,8 @@
#functions to automatically initialize some of YACReader's build options to
#default values if they're not set on build time
#for a more detailed description, see INSTALL.TXT
# functions to automatically initialize some of YACReader's build options to
# default values if they're not set on build time
# for a more detailed description, see INSTALL.TXT
#check Qt version
# check Qt version
QT_VERSION = $$[QT_VERSION]
QT_VERSION = $$split(QT_VERSION, ".")
QT_VER_MAJ = $$member(QT_VERSION, 0)
@ -11,30 +11,38 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
lessThan(QT_VER_MAJ, 5) {
error(YACReader requires Qt 5 or newer but Qt $$[QT_VERSION] was detected.)
}
lessThan(QT_VER_MIN, 4):!CONFIG(no_opengl) {
CONFIG += legacy_gl_widget
message ("Qt < 5.4 detected. Using QGLWidget for coverflow.")
lessThan(QT_VER_MIN, 6) {
warning ("Qt < 5.6 detected. Compilation will probably work, but some qml based components in YACReaderLibrary (GridView, InfoView) will fail at runtime.")
}
lessThan(QT_VER_MIN, 3){
error ("You need at least Qt 5.3 to build YACReader or YACReaderLibrary")
lessThan(QT_VER_MIN, 4):!CONFIG(no_opengl) {
CONFIG += legacy_gl_widget
warning ("Qt < 5.4 detected. Using QGLWidget for coverflow.")
warning ("QGLWidget based coverflow is scheduled for removal.")
}
lessThan(QT_VER_MIN, 3) {
error ("You need at least Qt 5.3 to compile YACReader or YACReaderLibrary.")
}
#build without opengl widget support
# Disable coverflow for arm targets
isEmpty(QMAKE_TARGET.arch) {
QMAKE_TARGET.arch = $$QMAKE_HOST.arch
}
contains(QMAKE_TARGET.arch, arm.*) {
message("Building for ARM architecture. Disabling OpenGL coverflow ...")
CONFIG += no_opengl
}
# build without opengl widget support
CONFIG(no_opengl) {
DEFINES += NO_OPENGL
}
#default values for decompression backends
# default value for comic archive decompression backend
!CONFIG(unarr):!CONFIG(7zip) {
unix {
CONFIG += unarr
}
win32 {
CONFIG += unarr
}
CONFIG += unarr
}
#default values for pdf render backend
# default values for pdf render backend
win32:!CONFIG(poppler):!CONFIG(pdfium):!CONFIG(no_pdf) {
CONFIG += pdfium
}