diff options
| author | gregory guy <g-gregory@gmx.fr> | 2019-06-27 16:35:25 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-06-28 13:45:47 +0200 |
| commit | aca01d5a8b7d3de53fa34696e18c91db720a5ab6 (patch) | |
| tree | 6b9b83c599cc5db58df8041ca5cf812e00bbd25e /kig/modes | |
| parent | 88af19c041ad4f1139f6f0a35cd1a4fe2018425f (diff) | |
| download | tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.tar.gz tdeedu-aca01d5a8b7d3de53fa34696e18c91db720a5ab6.zip | |
Conversion to the cmake building system.
Add includes to UI files to resolve FTBFS.
Signed-off-by: gregory guy <g-gregory@gmx.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d4a1613e9f119ae68c695ab60f8d9856d1a54a52)
Diffstat (limited to 'kig/modes')
| -rw-r--r-- | kig/modes/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | kig/modes/edittypebase.ui | 13 | ||||
| -rw-r--r-- | kig/modes/macrowizardbase.ui | 7 | ||||
| -rw-r--r-- | kig/modes/typesdialogbase.ui | 14 |
4 files changed, 50 insertions, 22 deletions
diff --git a/kig/modes/CMakeLists.txt b/kig/modes/CMakeLists.txt new file mode 100644 index 00000000..ab62086d --- /dev/null +++ b/kig/modes/CMakeLists.txt @@ -0,0 +1,38 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kigmodes (static) + +tde_add_library( kigmodes STATIC_PIC AUTOMOC + + SOURCES + edittypebase.ui + macrowizardbase.ui + textlabelwizardbase.ui + typesdialogbase.ui + base_mode.cc + construct_mode.cc + dragrectmode.cc + edittype.cc + label.cc + linkslabel.cpp + macro.cc + macrowizard.cc + mode.cc + moving.cc + normal.cc + popup.cc + textlabelwizard.cc + typesdialog.cpp +) diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index 8f9365c1..c0ed56cf 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -276,12 +276,9 @@ <slot>cancelSlot()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kicondialog.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui index ea20ead7..47d9a52d 100644 --- a/kig/modes/macrowizardbase.ui +++ b/kig/modes/macrowizardbase.ui @@ -181,8 +181,7 @@ </widget> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index cc5cec92..bea69868 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -327,14 +327,8 @@ <slot>cancelSlot()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> |