From: Mohammed Sameer Date: Sun, 18 Aug 2013 21:13:02 +0000 (+0300) Subject: Fix compile error with latest qt5 libresourceqt X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=25b676115c38c882782e2ec025c442bca8223686 Fix compile error with latest qt5 libresourceqt DBUSConnectionEventLoop::getInstance() has been removed It's also not a global static object anymore so it should be fine to rely on it being instantiated in the right thread --- diff --git a/src/cameraresources.cpp b/src/cameraresources.cpp index 4e936e5..3f7da5f 100644 --- a/src/cameraresources.cpp +++ b/src/cameraresources.cpp @@ -19,7 +19,9 @@ */ #include "cameraresources.h" +#if defined(QT4) #include +#endif #include #define APPLICATION_CLASS "camera" @@ -29,7 +31,10 @@ CameraResources::CameraResources(QObject *parent) : m_worker(new CameraResourcesWorker) { m_worker->moveToThread(&m_thread); + +#if defined(QT4) DBUSConnectionEventLoop::getInstance().moveToThread(&m_thread); +#endif QObject::connect(&m_thread, SIGNAL(started()), m_worker, SLOT(init())); m_thread.start();