Merge branch 'master' of ssh://bitbucket.org/smil3y/kde-playground

This commit is contained in:
Ivailo Monev 2024-05-18 03:36:19 +03:00
commit 31e7fef0a1
5 changed files with 30 additions and 19 deletions

View file

@ -1,10 +1,8 @@
project(kgpg) project(kgpg)
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
include(FeatureSummary) find_package(KDELibs4 4.21.0 REQUIRED)
find_package(KDE4 4.21.0 REQUIRED)
include(KDE4Defaults)
include_directories(${KDE4_INCLUDES}) include_directories(${KDE4_INCLUDES})
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif() endif()
@ -17,9 +15,8 @@ set(kgpg_SRCS
add_executable(kgpg ${kgpg_SRCS}) add_executable(kgpg ${kgpg_SRCS})
target_link_libraries(kgpg target_link_libraries(kgpg
${KDE4_KDEUI_LIBS} KDE4::kdeui
${KDE4_KFILE_LIBS} KDE4::kio
${KDE4_KIO_LIBS}
gpgme gpgme
) )

View file

@ -15,7 +15,7 @@ set(kman_sources
add_executable(kman ${kman_sources}) add_executable(kman ${kman_sources})
target_link_libraries(kman target_link_libraries(kman
KDE4::kdeui KDE4::kdeui
KDE4::kfile KDE4::kio
KDE4::karchive KDE4::karchive
) )

View file

@ -1,12 +1,11 @@
project(kwrite) project(kwrite)
cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
find_package(KDELibs4 4.19.0 REQUIRED)
find_package(KDE4 REQUIRED) include_directories(${KDE4_INCLUDES})
include(KDE4Defaults) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
endif()
include_directories(${KDE4_INCLUDES})
add_definitions(${KDE4_DEFINITIONS} ${QT_DEFINITIONS})
set(kwrite_sources set(kwrite_sources
kwritemain.cpp kwritemain.cpp
@ -14,8 +13,23 @@ set(kwrite_sources
) )
add_executable(kwrite ${kwrite_sources}) add_executable(kwrite ${kwrite_sources})
target_link_libraries(kwrite KDE4::ktexteditor KDE4::kio KDE4::kparts) target_link_libraries(kwrite
KDE4::ktexteditor
KDE4::kio
KDE4::kparts
)
install(TARGETS kwrite DESTINATION ${KDE4_BIN_INSTALL_DIR}) install(
install(FILES kwriteui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwrite) TARGETS kwrite
install(PROGRAMS kwrite.desktop DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}) DESTINATION ${KDE4_BIN_INSTALL_DIR}
)
install(
FILES kwriteui.rc
DESTINATION ${KDE4_DATA_INSTALL_DIR}/kwrite
)
install(
PROGRAMS kwrite.desktop
DESTINATION ${KDE4_XDG_APPS_INSTALL_DIR}
)

View file

@ -25,6 +25,7 @@ Boston, MA 02110-1301, USA.
#include <QFileInfo> #include <QFileInfo>
#include <QTextCodec> #include <QTextCodec>
#include <QTextStream>
KWriteApp::KWriteApp(KCmdLineArgs *m_args) KWriteApp::KWriteApp(KCmdLineArgs *m_args)
: KApplication () : KApplication ()

View file

@ -19,7 +19,6 @@
*/ */
#include "kwritemain.h" #include "kwritemain.h"
#include "kwritemain.moc"
#include "kwriteapp.h" #include "kwriteapp.h"
#include <ktexteditor/document.h> #include <ktexteditor/document.h>
#include <ktexteditor/view.h> #include <ktexteditor/view.h>
@ -672,7 +671,7 @@ int main(int argc, char **argv)
ki18n("KWrite"), ki18n("KWrite"),
KDE_VERSION_STRING, KDE_VERSION_STRING,
ki18n( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2, ki18n( "KWrite - Text Editor" ), KAboutData::License_LGPL_V2,
ki18n( "(c) 2000-2013 The Kate Authors" ), KLocalizedString(), "http://www.kate-editor.org" ); ki18n( "(c) 2000-2013 The Kate Authors" ));
aboutData.addAuthor (ki18n("Christoph Cullmann"), ki18n("Maintainer"), "cullmann@kde.org", "http://www.cullmann.io"); aboutData.addAuthor (ki18n("Christoph Cullmann"), ki18n("Maintainer"), "cullmann@kde.org", "http://www.cullmann.io");
aboutData.addAuthor (ki18n("Anders Lund"), ki18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk"); aboutData.addAuthor (ki18n("Anders Lund"), ki18n("Core Developer"), "anders@alweb.dk", "http://www.alweb.dk");
aboutData.addAuthor (ki18n("Joseph Wenninger"), ki18n("Core Developer"), "jowenn@kde.org","http://stud3.tuwien.ac.at/~e9925371"); aboutData.addAuthor (ki18n("Joseph Wenninger"), ki18n("Core Developer"), "jowenn@kde.org","http://stud3.tuwien.ac.at/~e9925371");