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/components/debugger/conditionalbreakpointdialogs.ui | 10 +++++-----
 quanta/components/debugger/dbgp/dbgpsettingss.ui           |  6 +++---
 quanta/components/debugger/gubed/gubedsettingss.ui         |  6 +++---
 quanta/components/debugger/pathmapperdialogs.ui            |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'quanta/components/debugger')

diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui
index fcd4b1db..221b5bcd 100644
--- a/quanta/components/debugger/conditionalbreakpointdialogs.ui
+++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui
@@ -321,9 +321,9 @@
     <tabstop>buttonCancel</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kled.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kled.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui
index 10888885..2f98a16b 100644
--- a/quanta/components/debugger/dbgp/dbgpsettingss.ui
+++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui
@@ -722,7 +722,7 @@
     <slot>slotLocalProjectToggle(bool)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui
index c9caa54c..92e5efd1 100644
--- a/quanta/components/debugger/gubed/gubedsettingss.ui
+++ b/quanta/components/debugger/gubed/gubedsettingss.ui
@@ -756,7 +756,7 @@
     <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextbrowser.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextbrowser.h</include>
+</includes>
 </UI>
diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui
index 58a79167..266989b9 100644
--- a/quanta/components/debugger/pathmapperdialogs.ui
+++ b/quanta/components/debugger/pathmapperdialogs.ui
@@ -339,7 +339,7 @@ The quanta will know that files starting with "/home/user/project/" on the local
     <slot>slotHistoryclicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kled.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kled.h</include>
+</includes>
 </UI>
-- 
cgit v1.2.3