Changeset 19 in pacpussensors for trunk

Timestamp:

Jul 31, 2013, 11:58:28 AM (11 years ago)

Author:

Marek Kurdej

Message:

Update: fixed LMOComponent compilation with Qt5.

Location:

trunk/LMOComponent

Files:

• CMakeLists.txt (modified) (4 diffs)
• LMOComponent.cpp (modified) (1 diff)
• LMOComponent.h (modified) (2 diffs)
• LMOComponentPlugin.cpp (deleted)
• LMOComponentPlugin.h (deleted)

trunk/LMOComponent/CMakeLists.txt

@@ -3 +3 @@
 ################################################################################
 add_definitions( -DLMOCOMPONENT_EXPORTS )
-
-################################################################################
-# Qt
-if(QT4_FOUND)
-    set(QT_USE_QTXML true)
-    set(QT_USE_QTNETWORK true)
-    include(${QT_USE_FILE})
-else()
-    message(ERROR "Qt4 needed")
-endif()
-
-add_definitions(
-    ${QT_DEFINITIONS}
-)
 
 ################################################################################
@@ -46 +32 @@
 
 set(MOC_FILES
-    LMOComponent.h
+    #LMOComponent.h
     ${PLUGIN_H}
 )
@@ -55 +41 @@
 ################################################################################
 # Call moc, uic
-qt4_wrap_cpp(MOC_SRCS
+qt_wrap_cpp(MOC_SRCS
     ${MOC_FILES}
 )
-qt4_wrap_ui(UI_SRCS
+qt_wrap_ui(UI_SRCS
     ${UI_FILES}
 )
@@ -99 +85 @@
 # INSTALL
 pacpus_install(${PROJECT_NAME})
-

trunk/LMOComponent/LMOComponent.cpp

@@ -5 +5 @@
 
 #include "LMOComponent.h"
+
+#include <Pacpus/kernel/Log.h>
+#include <Pacpus/kernel/ComponentFactory.h>
 
 using namespace pacpus;

trunk/LMOComponent/LMOComponent.h

@@ -19 +19 @@
 
 #include "Pacpus/kernel/ComponentBase.h"
+#include "LMOComponentConfig.h"
 
 namespace pacpus {
@@ -25 +26 @@
         : public ComponentBase
 {
-    Q_OBJECT
+    //Q_OBJECT
 
 public: