From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 5 Feb 2015 20:47:59 +0000 (+0100)
Subject: Merge pull request #102 from mamarley/qcaqt5
X-Git-Tag: 0.12-beta1~36
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=e50ae7a06fc4e5d3a911c361d30953410deab609;p=quassel.git

Merge pull request #102 from mamarley/qcaqt5

Add support for compiling with QCA on Qt5
---

e50ae7a06fc4e5d3a911c361d30953410deab609
diff --cc src/common/CMakeLists.txt
index 3f08a2c0,52560a12..90ccb5f3
--- a/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()