Merge pull request #102 from mamarley/qcaqt5

Add support for compiling with QCA on Qt5

diff --cc CMakeLists.txt
Simple merge

diff --cc src/common/CMakeLists.txt
index 3f08a2c,52560a1..90ccb5f
--- 1/src/common/CMakeLists.txt
--- 2/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@@ -45,13 -46,8 +45,13 @@@ set(SOURCE
      coreinfo.h
  )
  
 +if (USE_QT5)
 +    list(APPEND SOURCES qt5cliparser.cpp)
 +else()
 +    list(APPEND SOURCES cliparser.cpp)
 +endif()
  
- if (QCA2_FOUND)
+ if (QCA2_FOUND OR QCA2-QT5_FOUND)
      set(SOURCES ${SOURCES} keyevent.cpp)
  endif()
  

diff --cc src/core/CMakeLists.txt
Simple merge