From 2a67152f7b0b51e0059f6d29bd54a58765f7c91e Mon Sep 17 00:00:00 2001
From: Felix Kauselmann <2039670+selmf@users.noreply.github.com>
Date: Tue, 17 Feb 2015 18:47:52 +0100
Subject: [PATCH] Remove depreceated qt4-config from .pro/.pri files.

---
 YACReader/YACReader.pri               | 18 +-----------------
 YACReader/YACReader.pro               | 10 ++--------
 YACReaderLibrary/YACReaderLibrary.pro | 21 +++++----------------
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri
index 066fdafe..1a75c5ef 100644
--- a/YACReader/YACReader.pri
+++ b/YACReader/YACReader.pri
@@ -7,14 +7,9 @@ INCLUDEPATH += $$PWD/../common \
 win32 {
 LIBS += -L$$PWD/../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
 !CONFIG(no_opengl) {
@@ -26,15 +21,8 @@ CONFIG -= embed_manifest_exe
 
 unix:!macx{
 
-isEqual(QT_MAJOR_VERSION, 5) {
 INCLUDEPATH  += /usr/include/poppler/qt5
 LIBS         += -L/usr/lib -lpoppler-qt5
-}
-else {
-INCLUDEPATH  += /usr/include/poppler/qt4
-LIBS         += -L/usr/lib -lpoppler-qt4
-
-}
 
 !CONFIG(no_opengl) {
 	LIBS += -lGLU
@@ -71,11 +59,7 @@ QT += network widgets core
 #CONFIG += release
 CONFIG -= flat
 
-isEqual(QT_MAJOR_VERSION, 5) {
-	QT += multimedia
-} else {
-	QT += phonon
-}
+QT += multimedia
 
 # Input
 HEADERS += $$PWD/../common/comic.h \
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 624c58b3..06285a1f 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -17,14 +17,8 @@ CONFIG(no_opengl) {
 QMAKE_CXXFLAGS += -std=c++11
 }
 
-isEqual(QT_MAJOR_VERSION, 5) {
-	Release:DESTDIR = ../release5
-	Debug:DESTDIR = ../debug5
-
-} else {
-	Release:DESTDIR = ../release
-	Debug:DESTDIR = ../debug
-}
+Release:DESTDIR = ../release
+Debug:DESTDIR = ../debug
 
 SOURCES += main.cpp
 include(YACReader.pri)
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
index 4fac73e0..8a5d9dfa 100644
--- a/YACReaderLibrary/YACReaderLibrary.pro
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -23,14 +23,8 @@ win32 {
 
 LIBS += -L../dependencies/poppler/lib -loleaut32 -lole32 -lshell32
 
-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
 !CONFIG(no_opengl) {
@@ -42,15 +36,10 @@ CONFIG -= embed_manifest_exe
 
 unix:!macx{
 
-isEqual(QT_MAJOR_VERSION, 5) {
 INCLUDEPATH  += /usr/include/poppler/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
 	}
 }
@@ -240,9 +229,9 @@ TRANSLATIONS    = yacreaderlibrary_es.ts \
 									yacreaderlibrary_de.ts \
 									yacreaderlibrary_source.ts
 
-isEqual(QT_MAJOR_VERSION, 5) {
-	Release:DESTDIR = ../release5
-	Debug:DESTDIR = ../debug5
+
+Release:DESTDIR = ../release
+Debug:DESTDIR = ../debug
 
 #QML/GridView
 QT += quick qml