*magit: libhybris-flash*

Remote:   master @ origin (git@github.com:amarchen/libhybris-flash.git)
Local:    master ~/git/libhybris-flash/
Head:     4cf8a9f Actually call c++ from qml

Changes:
	Modified   libhybris-flash.pro
diff --git a/libhybris-flash.pro b/libhybris-flash.pro
index 95884b6..5681c4c 100644
--- a/libhybris-flash.pro
+++ b/libhybris-flash.pro
@@ -9,6 +9,9 @@
 TARGET = libhybris-flash

 CONFIG += sailfishapp
+QT -= gui
+
+LIBS += -lcamera

 SOURCES += src/libhybris-flash.cpp \
     src/cameratester.cpp
@@ -23,4 +26,3 @@ OTHER_FILES += qml/libhybris-flash.qml \

 HEADERS += \
     src/cameratester.h
-
	Modified   rpm/libhybris-flash.spec
diff --git a/rpm/libhybris-flash.spec b/rpm/libhybris-flash.spec
index 5736797..66796bf 100644
--- a/rpm/libhybris-flash.spec
+++ b/rpm/libhybris-flash.spec
@@ -1,7 +1,7 @@
-#
+#
 # Do NOT Edit the Auto-generated Part!
 # Generated by: spectacle version 0.27
-#
+#

 Name:       libhybris-flash

@@ -40,7 +40,7 @@ Short description of my SailfishOS Application
 # >> build pre
 # << build pre

-%qtc_qmake5
+%qtc_qmake5

 %qtc_make %{?_smp_mflags}

@@ -62,11 +62,12 @@ desktop-file-install --delete-original       \

 %files
 %defattr(-,root,root,-)
-/usr/share/icons/hicolor/90x90/apps
+#/usr/share/icons/hicolor/90x90/apps
 /usr/share/applications
 /usr/share/libhybris-flash
 /usr/bin
-%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
+#%{_datadir}/icons/hicolor/90x90/apps/%{name}.png
+%{_datadir}/icons/hicolor/86x86/apps/%{name}.png
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}/qml
 %{_bindir}
	Modified   src/cameratester.cpp
diff --git a/src/cameratester.cpp b/src/cameratester.cpp
index fd2e9ac..4819c82 100644
--- a/src/cameratester.cpp
+++ b/src/cameratester.cpp
@@ -1,48 +1,48 @@
 #include "cameratester.h"

-//#include <hybris/camera/camera_compatibility_layer_capabilities.h >  // for constants
+#include <hybris/camera/camera_compatibility_layer_capabilities.h>  // for constants

 void CameraTester::connectToCamera()
 {
     emit logHappened("connecting");
-//    memset(&listener, 0, sizeof(m_listener));  // not sure while it's needed, but test example does this nullification
-//    m_cc = android_camera_connect_to(BACK_FACING_CAMERA_TYPE,
-//                                     &listener);
+    memset(&m_listener, 0, sizeof(m_listener));  // not sure while it's needed, but test example does this nullification
+    m_cc = android_camera_connect_to(BACK_FACING_CAMERA_TYPE,
+                                     &m_listener);
     emit logHappened("connected");
 }

 void CameraTester::turnFlashToTorch()
 {
     emit logHappened("trying torch");
-//    android_camera_set_flash_mode(m_cc, FLASH_MODE_TORCH);
+    android_camera_set_flash_mode(m_cc, FLASH_MODE_TORCH);
     emit logHappened("tried torch");
 }

 void CameraTester::turnFlashToOn()
 {
     emit logHappened("trying on");
-//    android_camera_set_flash_mode(m_cc, FLASH_MODE_ON);
+    android_camera_set_flash_mode(m_cc, FLASH_MODE_ON);
     emit logHappened("tried on");
 }

 void CameraTester::startPreview()
 {
     emit logHappened("starting preview");
-//    android_camera_start_preview(m_cc);
+    android_camera_start_preview(m_cc);
     emit logHappened("started preview");
 }

 void CameraTester::stopPreview()
 {
     emit logHappened("stopping preview");
-//    android_camera_stop_preview(m_cc);
+    android_camera_stop_preview(m_cc);
     emit logHappened("stopped preview");
 }

 void CameraTester::disconnectCamera()
 {
     emit logHappened("disconnecting");
-//    android_camera_disconnect(m_cc);
+    android_camera_disconnect(m_cc);
     emit logHappened("disconnected");
 }

	Modified   src/cameratester.h
diff --git a/src/cameratester.h b/src/cameratester.h
index fe07fa2..a05e62e 100644
--- a/src/cameratester.h
+++ b/src/cameratester.h
@@ -2,7 +2,7 @@
 #define CAMERATESTER_H

 #include <QObject>
-//#include <hybris/camera/camera_compatibility_layer.h >
+#include <hybris/camera/camera_compatibility_layer.h>

 class CameraTester : public QObject
 {
@@ -22,8 +22,8 @@ signals:
 public slots:

 private:
-//    CameraControlListener m_listener;
-//    CameraControl* m_cc;
+    CameraControlListener m_listener;
+    CameraControl* m_cc;

 };

	Modified   src/libhybris-flash.cpp
diff --git a/src/libhybris-flash.cpp b/src/libhybris-flash.cpp
index 0c3220e..776ed1a 100644
--- a/src/libhybris-flash.cpp
+++ b/src/libhybris-flash.cpp
@@ -28,9 +28,9 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifdef QT_QML_DEBUG
+//#ifdef QT_QML_DEBUG
 #include <QtQuick>
-#endif
+//#endif

 #include <sailfishapp.h>
 #include "cameratester.h"
@@ -48,4 +48,3 @@ int main(int argc, char *argv[])
     view->showFullScreen();
     return app->exec();
 }
-