Changeset 178 in pacpusframework

Timestamp:

Oct 11, 2013, 3:36:46 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: minor fix.
Added: FIXME: Qt4/Qt5 dependency search.

Location:

trunk

Files:

• cmake/PacpusDependencies.cmake (modified) (2 diffs)
• src/PacpusLib/ComponentBase.cpp (modified) (1 diff)

trunk/cmake/PacpusDependencies.cmake

@@ -15 +15 @@
 set(PACPUS_DEPENDENCIES_LIB "")
 
+# FIXME: first find_package(Qt5Widgets QUIET), then Qt4
 set(PACPUS_USE_QT5 FALSE CACHE BOOL "Whether to use Qt5")
 if(NOT PACPUS_USE_QT5)
-    find_package(Qt4)
+    find_package(Qt4 QUIET)
     if(NOT QT4_FOUND)
         message(WARNING "Qt4 not found try to find Qt5")
@@ -112 +113 @@
             log
             log_setup
+            program_options
     )
     include_directories(${Boost_INCLUDE_DIRS})

trunk/src/PacpusLib/ComponentBase.cpp

@@ -26 +26 @@
   : m_componentName(componentName)
   , m_isActive(false)
-  , m_isRecording(true)
+  , mIsRecording(true)
   , m_manager(NULL)
   , m_ui(NULL)