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 /kwordquiz | |
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 'kwordquiz')
-rw-r--r-- | kwordquiz/CMakeLists.txt | 1 | ||||
-rw-r--r-- | kwordquiz/src/CMakeLists.txt | 99 | ||||
-rw-r--r-- | kwordquiz/src/dlglanguagebase.ui | 3 | ||||
-rw-r--r-- | kwordquiz/src/dlgrcbase.ui | 8 | ||||
-rw-r--r-- | kwordquiz/src/examples/CMakeLists.txt | 9 | ||||
-rw-r--r-- | kwordquiz/src/pics/CMakeLists.txt | 3 | ||||
-rw-r--r-- | kwordquiz/src/prefcardappearancebase.ui | 12 | ||||
-rw-r--r-- | kwordquiz/src/prefcharacterbase.ui | 6 | ||||
-rw-r--r-- | kwordquiz/src/prefquizbase.ui | 7 | ||||
-rw-r--r-- | kwordquiz/src/qaviewbase.ui | 3 |
10 files changed, 132 insertions, 19 deletions
diff --git a/kwordquiz/CMakeLists.txt b/kwordquiz/CMakeLists.txt new file mode 100644 index 00000000..d4fb6582 --- /dev/null +++ b/kwordquiz/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( src ) diff --git a/kwordquiz/src/CMakeLists.txt b/kwordquiz/src/CMakeLists.txt new file mode 100644 index 00000000..4e0b5cad --- /dev/null +++ b/kwordquiz/src/CMakeLists.txt @@ -0,0 +1,99 @@ +add_subdirectory( pics ) +add_subdirectory( examples ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/kwordquiz/icons +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### kwordquiz (executable) + +tde_add_executable( kwordquiz AUTOMOC + + SOURCES + dlglanguagebase.ui + flashviewbase.ui + multipleviewbase.ui + qaviewbase.ui + prefeditorbase.ui + prefquizbase.ui + dlgsortbase.ui + dlgrcbase.ui + prefcharacterbase.ui + prefcardappearancebase.ui + kwordquizprefs.cpp + kwordquizview.cpp + kwordquizdoc.cpp + kwordquiz.cpp + main.cpp + qaview.cpp + flashview.cpp + multipleview.cpp + wqquiz.cpp + wqlistitem.cpp + wqscore.cpp + keduvocdata.cpp + prefeditor.cpp + prefquiz.cpp + dlgsort.cpp + dlgrc.cpp + dlgspecchar.cpp + kvtmlwriter.cpp + dlglanguage.cpp + wqprintdialogpage.cpp + prefcharacter.cpp + paukerreader.cpp + wqlreader.cpp + wqlwriter.cpp + wqundo.cpp + prefcardappearance.cpp + kwqnewstuff.cpp + prefs.kcfgc + LINK + tdecore-shared + tdeui-shared + tdeio-shared + tdeprint-shared + tdenewstuff-shared + + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### other data + +install( + FILES kwordquizui.rc eventsrc + DESTINATION ${DATA_INSTALL_DIR}/kwordquiz +) + +install( + FILES kwordquiz.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} +) + +install( + FILES x-kwordquiz.desktop + DESTINATION ${MIME_INSTALL_DIR}/application +) + +install( + FILES kwordquiz.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) + +install( + FILES kwordquizrc + DESTINATION ${CONFIG_INSTALL_DIR} +) + diff --git a/kwordquiz/src/dlglanguagebase.ui b/kwordquiz/src/dlglanguagebase.ui index 38edf095..8acf983c 100644 --- a/kwordquiz/src/dlglanguagebase.ui +++ b/kwordquiz/src/dlglanguagebase.ui @@ -241,4 +241,7 @@ </image> </images> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/kwordquiz/src/dlgrcbase.ui b/kwordquiz/src/dlgrcbase.ui index 3fec70fd..8abbd6cd 100644 --- a/kwordquiz/src/dlgrcbase.ui +++ b/kwordquiz/src/dlgrcbase.ui @@ -174,9 +174,7 @@ <customwidgets> </customwidgets> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>krestrictedline.h</includehint> - <includehint>krestrictedline.h</includehint> - <includehint>krestrictedline.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">krestrictedline.h</include> +</includes> </UI> diff --git a/kwordquiz/src/examples/CMakeLists.txt b/kwordquiz/src/examples/CMakeLists.txt new file mode 100644 index 00000000..2dc0d2a3 --- /dev/null +++ b/kwordquiz/src/examples/CMakeLists.txt @@ -0,0 +1,9 @@ +install( + FILES + example.kvtml + french_verbs.kvtml + fill_in_the_blank.kvtml + us_states_and_capitals.kvtml + + DESTINATION ${DATA_INSTALL_DIR}/kwordquiz/examples +) diff --git a/kwordquiz/src/pics/CMakeLists.txt b/kwordquiz/src/pics/CMakeLists.txt new file mode 100644 index 00000000..7041273c --- /dev/null +++ b/kwordquiz/src/pics/CMakeLists.txt @@ -0,0 +1,3 @@ +tde_install_icons( kwordquiz kwordquiz_doc ) + +tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kwordquiz/icons ) diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 31adb29d..9a1af12b 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -543,11 +543,9 @@ <slot>slotCardColorChanged(const TQColor &)</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>tdefontrequester.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> - <includehint>kcolorbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdefontrequester.h</include> + <include location="global" impldecl="in implementation">kcolorbutton.h</include> +</includes> </UI> diff --git a/kwordquiz/src/prefcharacterbase.ui b/kwordquiz/src/prefcharacterbase.ui index da54220a..69a80783 100644 --- a/kwordquiz/src/prefcharacterbase.ui +++ b/kwordquiz/src/prefcharacterbase.ui @@ -403,7 +403,7 @@ <tabstop>btnCharacter</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 2f7f333c..89e0dffa 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -288,8 +288,7 @@ <slot>slotAutoFlipClicked()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> </UI> diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index fcb743a4..9c5b3353 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -866,4 +866,7 @@ <slot access="private">slotCheck()</slot> </Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> |