Changeset 119 in pacpusframework


Ignore:
Timestamp:
Jun 28, 2013, 4:56:24 PM (11 years ago)
Author:
morasjul
Message:

add Qt4 compatibility

Location:
branches/2.0-beta1
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0-beta1/cmake/PacpusConfiguration.cmake

    r89 r119  
    2424set(PACPUS_USE_SOLUTION_FOLDERS  FALSE CACHE BOOL "Use solution folders to classify projects, works in MS Visual Studio")
    2525
     26set(QT5      FALSE CACHE BOOL " Use Qt5 or Qt4")
     27
    2628if(PACPUS_USE_SOLUTION_FOLDERS)
    2729    if(CMAKE_VERSION VERSION_GREATER "2.8.0")
  • branches/2.0-beta1/cmake/PacpusDependencies.cmake

    r92 r119  
    1414set(PACPUS_DEPENDENCIES_INC "")
    1515set(PACPUS_DEPENDENCIES_LIB "")
     16
     17if(NOT QT5)
     18    find_package(Qt4)
     19    if(NOT QT4_FOUND)
     20        message(WARNING "Qt4 not found try to find Qt5")
     21        set(QT5 TRUE)
     22    endif()
     23endif()
     24
     25if(QT5)
    1626
    1727# ========================================
     
    6373endif()
    6474
     75else(QT5)
     76
     77# ========================================
     78# All the Pacpus' modules depends from Qt4
     79# However, since each module requires specific Qt's modules, they have to include their own QT_USE_FILE
     80# ========================================
     81find_package(Qt4 REQUIRED)
     82
     83endif(QT5)
     84
    6585# ========================================
    6686# Boost
  • branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h

    r110 r119  
    4444
    4545            qDebug() << "Revever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
     46
     47            //if(_component) get state
    4648
    4749            if(typedEvent->tr_ < 500 && readingMode_ == TimeBounded) {
  • branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

    r111 r119  
    4040    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
    4141    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
    42     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/QSerialPort.h
     42    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
    4343    ./src/matrice.cpp
    4444    ./src/geodesie.cpp
    4545    ./src/AsyncWorkerBase.cpp
    4646    ./src/PeriodicWorker.cpp
    47     #./src/QSerialPort.cpp
     47    #./src/PacpusSerialPort.cpp
    4848)
    4949
     
    5555    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
    5656    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
    57     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/QSerialPort.h
     57    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
    5858)
    5959
Note: See TracChangeset for help on using the changeset viewer.