Changeset 19 in pacpussensors


Ignore:
Timestamp:
07/31/13 11:58:28 (11 years ago)
Author:
Marek Kurdej
Message:

Update: fixed LMOComponent compilation with Qt5.

Location:
trunk/LMOComponent
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMOComponent/CMakeLists.txt

    r17 r19  
    33################################################################################
    44add_definitions( -DLMOCOMPONENT_EXPORTS )
    5 
    6 ################################################################################
    7 # Qt
    8 if(QT4_FOUND)
    9     set(QT_USE_QTXML true)
    10     set(QT_USE_QTNETWORK true)
    11     include(${QT_USE_FILE})
    12 else()
    13     message(ERROR "Qt4 needed")
    14 endif()
    15 
    16 add_definitions(
    17     ${QT_DEFINITIONS}
    18 )
    195
    206################################################################################
    … …  
    4632
    4733set(MOC_FILES
    48     LMOComponent.h
     34    #LMOComponent.h
    4935    ${PLUGIN_H}
    5036)
    … …  
    5541################################################################################
    5642# Call moc, uic
    57 qt4_wrap_cpp(MOC_SRCS
     43qt_wrap_cpp(MOC_SRCS
    5844    ${MOC_FILES}
    5945)
    60 qt4_wrap_ui(UI_SRCS
     46qt_wrap_ui(UI_SRCS
    6147    ${UI_FILES}
    6248)
    … …  
    9985# INSTALL
    10086pacpus_install(${PROJECT_NAME})
    101 

  • trunk/LMOComponent/LMOComponent.cpp

    r17 r19  
    55
    66#include "LMOComponent.h"
     7
     8#include <Pacpus/kernel/Log.h>
     9#include <Pacpus/kernel/ComponentFactory.h>
    710
    811using namespace pacpus;

  • trunk/LMOComponent/LMOComponent.h

    r17 r19  
    1919
    2020#include "Pacpus/kernel/ComponentBase.h"
     21#include "LMOComponentConfig.h"
    2122
    2223namespace pacpus {
    … …  
    2526        : public ComponentBase
    2627{
    27     Q_OBJECT
     28    //Q_OBJECT
    2829
    2930public:
Note: See TracChangeset for help on using the changeset viewer.