From eea71ca9ecdfbd4682054a86cc9bbf954af94693 Mon Sep 17 00:00:00 2001
From: gregory guy <g-gregory@gmx.fr>
Date: Fri, 28 Jun 2019 15:14:51 +0200
Subject: Conversion to the cmake building system. Delete empty files
 (dummy.cpp, xsldbgconfig.h). Remove hard-coded path for the kmdr-executor
 executable. Replaced $TQTDIR/doc/html string path for TQTDOCDIR in kommander.
 Add man pages taken from the Debian packaging.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gregory guy <gregory-tde@laposte.net>

Fix linking - kxsldbgcommon-static and  kimagemapeditorcommon-static needs to be embedded.
Move the linking of xml and readline libraries to the appropriate static libraries.
Add build option WITH_QUANTA_CVSSERVICE.
Add a test whether the readline can be linked standalone or whether ncurses is needed.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130)
---
 quanta/dialogs/actionconfigdialogs.ui | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'quanta/dialogs/actionconfigdialogs.ui')

diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index fae092c2..f9ecce1b 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -972,10 +972,6 @@
     <tabstop>buttonApply</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<includes>
-    <include location="global" impldecl="in implementation">kkeybutton.h</include>
-    <include location="global" impldecl="in implementation">kpushbutton.h</include>
-</includes>
 <Q_SLOTS>
     <slot>buttonOk_clicked()</slot>
     <slot>slotNewAction()</slot>
@@ -991,11 +987,12 @@
     <slot>slotTextChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kicondialog.h</includehint>
-    <includehint>kkeybutton.h</includehint>
-    <includehint>tdelistbox.h</includehint>
-    <includehint>filecombo.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kkeybutton.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+    <include location="global" impldecl="in implementation">kicondialog.h</include>
+    <include location="global" impldecl="in implementation">tdelistbox.h</include>
+    <include location="global" impldecl="in implementation">filecombo.h</include>
+</includes>
 </UI>
-- 
cgit v1.2.1