Readd QImage includes.

Do not remove gui lib for headless binary as it needs it to use Qimage. Rename headless package to qcma-cli.
2014-04-04 11:45:53 -04:30
parent c88c2d34e9
commit 00f1c0eee2
7 changed files with 7 additions and 9 deletions
--- 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)
--- a/qcma_common.pri
+++ b/qcma_common.pri
@@ -4,9 +4,7 @@
 #
 #-------------------------------------------------

-QT       += core \
-            network \
-            sql
+QT += core network sql

 VERSION = 0.3.0

--- 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 \
--- 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;
--- a/src/avdecoder.h
+++ b/src/avdecoder.h
@@ -20,7 +20,6 @@
 #ifndef AVDECODER_H
 #define AVDECODER_H

-#include <QImage>
 #include <QString>

 extern "C" {
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -1,6 +1,7 @@
 #include "database.h"
 #include "avdecoder.h"

+#include <QImage>
 #include <QSettings>
 #include <QThread>

--- 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>