From 00f1c0eee247daefa596c5f15435bfacf911f843 Mon Sep 17 00:00:00 2001
From: codestation <codestation404@gmail.com>
Date: Fri, 4 Apr 2014 11:45:53 -0430
Subject: [PATCH] Readd QImage includes. Do not remove gui lib for headless
 binary as it needs it to use Qimage. Rename headless package to qcma-cli.

---
 debian/control    | 2 +-
 qcma_common.pri   | 4 +---
 qcma_gui.pro      | 6 ++----
 src/avdecoder.cpp | 1 +
 src/avdecoder.h   | 1 -
 src/database.cpp  | 1 +
 src/sqlitedb.cpp  | 1 +
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 02eed63..25215aa 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Content Manager Assistant for the PS Vita
 
-Package: qcma-headless
+Package: qcma-cli
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Content Manager Assistant for the PS Vita (headless version)
diff --git a/qcma_common.pri b/qcma_common.pri
index 9ccb8f6..29f0a42 100644
--- a/qcma_common.pri
+++ b/qcma_common.pri
@@ -4,9 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core \
-            network \
-            sql
+QT += core network sql
 
 VERSION = 0.3.0
 
diff --git a/qcma_gui.pro b/qcma_gui.pro
index c86ff89..984d645 100644
--- a/qcma_gui.pro
+++ b/qcma_gui.pro
@@ -1,10 +1,8 @@
 include(qcma_common.pri)
 
-TARGET = qcma
+QT += gui widgets
 
-QT       += \
-            gui \
-            widgets
+TARGET = qcma
 
 SOURCES += \
     src/gui/main.cpp \
diff --git a/src/avdecoder.cpp b/src/avdecoder.cpp
index c5b0142..f707a22 100644
--- a/src/avdecoder.cpp
+++ b/src/avdecoder.cpp
@@ -24,6 +24,7 @@
 #include <QDebug>
 #include <QBuffer>
 #include <QFile>
+#include <QImage>
 #include <QSettings>
 
 AVDecoder::AvInit init;
diff --git a/src/avdecoder.h b/src/avdecoder.h
index 2797c2b..586dc98 100644
--- a/src/avdecoder.h
+++ b/src/avdecoder.h
@@ -20,7 +20,6 @@
 #ifndef AVDECODER_H
 #define AVDECODER_H
 
-#include <QImage>
 #include <QString>
 
 extern "C" {
diff --git a/src/database.cpp b/src/database.cpp
index ec6a33a..4743638 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -1,6 +1,7 @@
 #include "database.h"
 #include "avdecoder.h"
 
+#include <QImage>
 #include <QSettings>
 #include <QThread>
 
diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp
index d1a582f..56c2b34 100644
--- a/src/sqlitedb.cpp
+++ b/src/sqlitedb.cpp
@@ -26,6 +26,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QImage>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #include <QStandardPaths>