mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove depreceated qt4-config from .pro/.pri files.

Browse Source
This commit is contained in:
Felix Kauselmann 2015-02-17 18:47:52 +01:00
parent 9af677cea5
commit 2a67152f7b
3 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
YACReader/YACReader.pri
View File

@ -7,14 +7,9 @@ INCLUDEPATH += $$PWD/../common \
win32 { win32 {
LIBS += -L$$PWD/../dependencies/poppler/lib -loleaut32 -lole32 LIBS += -L$$PWD/../dependencies/poppler/lib -loleaut32 -lole32
isEqual(QT_MAJOR_VERSION, 5) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
} }
else {
LIBS += -lpoppler-qt4
INCLUDEPATH += ../dependencies/poppler/include/qt4
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
@ -26,15 +21,8 @@ CONFIG -= embed_manifest_exe
unix:!macx{ unix:!macx{
isEqual(QT_MAJOR_VERSION, 5) {
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
}
else {
INCLUDEPATH += /usr/include/poppler/qt4
LIBS += -L/usr/lib -lpoppler-qt4
}
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
LIBS += -lGLU LIBS += -lGLU
@ -71,11 +59,7 @@ QT += network widgets core
#CONFIG += release #CONFIG += release
CONFIG -= flat CONFIG -= flat
isEqual(QT_MAJOR_VERSION, 5) { QT += multimedia
QT += multimedia
} else {
QT += phonon
}
# Input # Input
HEADERS += $$PWD/../common/comic.h \ HEADERS += $$PWD/../common/comic.h \

10
YACReader/YACReader.pro
View File

@ -17,14 +17,8 @@ CONFIG(no_opengl) {
QMAKE_CXXFLAGS += -std=c++11 QMAKE_CXXFLAGS += -std=c++11
} }
isEqual(QT_MAJOR_VERSION, 5) { Release:DESTDIR = ../release
Release:DESTDIR = ../release5 Debug:DESTDIR = ../debug
Debug:DESTDIR = ../debug5
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
SOURCES += main.cpp SOURCES += main.cpp
include(YACReader.pri) include(YACReader.pri)

21
YACReaderLibrary/YACReaderLibrary.pro
View File

@ -23,14 +23,8 @@ win32 {
LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32
isEqual(QT_MAJOR_VERSION, 5) {
LIBS += -lpoppler-qt5 LIBS += -lpoppler-qt5
INCLUDEPATH += ../dependencies/poppler/include/qt5 INCLUDEPATH += ../dependencies/poppler/include/qt5
}
else {
LIBS += -lpoppler-qt4
INCLUDEPATH += ../dependencies/poppler/include/qt4
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT
!CONFIG(no_opengl) { !CONFIG(no_opengl) {
@ -42,15 +36,10 @@ CONFIG -= embed_manifest_exe
unix:!macx{ unix:!macx{
isEqual(QT_MAJOR_VERSION, 5) {
INCLUDEPATH += /usr/include/poppler/qt5 INCLUDEPATH += /usr/include/poppler/qt5
LIBS += -L/usr/lib -lpoppler-qt5 LIBS += -L/usr/lib -lpoppler-qt5
}
else { !CONFIG(no_opengl) {
INCLUDEPATH += /usr/include/poppler/qt4
LIBS += -L/usr/lib -lpoppler-qt4
}
!CONFIG(no_opengl) {
LIBS += -lGLU LIBS += -lGLU
} }
} }
@ -240,9 +229,9 @@ TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_de.ts \ yacreaderlibrary_de.ts \
yacreaderlibrary_source.ts yacreaderlibrary_source.ts
isEqual(QT_MAJOR_VERSION, 5) {
Release:DESTDIR = ../release5 Release:DESTDIR = ../release
Debug:DESTDIR = ../debug5 Debug:DESTDIR = ../debug
#QML/GridView #QML/GridView
QT += quick qml QT += quick qml