[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konversation/frameworks] /: Disable QCA support until there's time to assess things on Qt 5.
From:       Eike Hein <hein () kde ! org>
Date:       2014-07-12 19:12:15
Message-ID: E1X62iV-0002cD-2s () scm ! kde ! org
[Download RAW message or body]

Git commit c0d823da537fabba18046a0d98f2328b964b67ef by Eike Hein.
Committed on 12/07/2014 at 19:12.
Pushed by hein into branch 'frameworks'.

Disable QCA support until there's time to assess things on Qt 5.

M  +6    -3    CMakeLists.txt

http://commits.kde.org/konversation/c0d823da537fabba18046a0d98f2328b964b67ef

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0236c04..f8d69b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,12 @@ set_package_properties(BalooWidgets PROPERTIES DESCRIPTI=
ON "Baloos Widgets"
 =

 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR=
} ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${BALOO_INCLUDE_DIR} =
${BALOO_WIDGETS_INCLUDE_DIR})
 =

-macro_optional_find_package(QCA2)
-macro_bool_to_01(QCA2_FOUND HAVE_QCA2)
-macro_log_feature(QCA2_FOUND "QCA" "Qt Cryptographic Architecture" "http:/=
/delta.affinix.com/qca" FALSE "2.0.0" "Required for using encryption in IRC=
")
+
+#FIXME Reenable when on QCA-for-Qt5.
+set(HAVE_QCA2 FALSE)
+#macro_optional_find_package(QCA2)
+#macro_bool_to_01(QCA2_FOUND HAVE_QCA2)
+#macro_log_feature(QCA2_FOUND "QCA" "Qt Cryptographic Architecture" "http:=
//delta.affinix.com/qca" FALSE "2.0.0" "Required for using encryption in IR=
C")
 =

 check_include_file("stropts.h" HAVE_STROPTS_H)
 check_include_file("byteswap.h" HAVE_BYTESWAP_H)
[prev in list] [next in list] [prev in thread] [next in thread]