diff options
| author | gregory guy <g-gregory@gmx.fr> | 2019-06-28 15:14:51 +0200 |
|---|---|---|
| committer | gregory guy <gregory-tde@laposte.net> | 2021-03-11 15:04:14 +0100 |
| commit | 4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (patch) | |
| tree | e532b01e8168b2f849f8aaa3266a58b088705726 /quanta/treeviews | |
| parent | 10d21d001e92e653cec6b6d1c05983abd00a1195 (diff) | |
| download | tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.tar.gz tdewebdev-4c43d1fbb66a296958ed1d0dbddf3f8ac4466130.zip | |
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.
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>
Diffstat (limited to 'quanta/treeviews')
| -rw-r--r-- | quanta/treeviews/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | quanta/treeviews/filestreeview.cpp | 3 | ||||
| -rw-r--r-- | quanta/treeviews/projecttreeview.cpp | 4 | ||||
| -rw-r--r-- | quanta/treeviews/quantapropertiespage.ui | 3 | ||||
| -rw-r--r-- | quanta/treeviews/templatedirform.ui | 6 |
5 files changed, 18 insertions, 3 deletions
diff --git a/quanta/treeviews/CMakeLists.txt b/quanta/treeviews/CMakeLists.txt index 094ab227..e5b8d6a3 100644 --- a/quanta/treeviews/CMakeLists.txt +++ b/quanta/treeviews/CMakeLists.txt @@ -9,8 +9,11 @@ # ################################################# +add_compile_options( ${ICU_CXXFLAGS} ) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/quanta/dialogs/tagdialogs ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/src @@ -22,9 +25,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/parts/kafka ${CMAKE_SOURCE_DIR}/quanta/components/csseditor + ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/quanta/plugins ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} ${LIBXML_INCLUDE_DIRS} ) diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 1de8333b..444bbc0c 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif // KDE includes #include <kdebug.h> diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 1bb822b3..c07a7183 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -15,6 +15,10 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // QT includes #include <tqpainter.h> #include <tqlabel.h> diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index d70a6f6e..78a63b0d 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -244,4 +244,7 @@ <tabstop>parentAttr</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index a8cb7705..b1b80b41 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -164,7 +164,7 @@ <slot>okBtn_clicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> |