diff --git a/CMakeLists.txt b/CMakeLists.txt index c00fe4d9..70088e85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,6 @@ if(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) set(KDE_NO_DEPRECATED TRUE) endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) -############### Load the CTest options ############### -# CTestCustom.cmake has to be in the CTEST_BINARY_DIR. -# in the KDE build system, this is the same as CMAKE_BINARY_DIR. -configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake COPYONLY) - ################# now find all used packages ################# set (QT_MIN_VERSION "4.8.2") @@ -226,18 +221,18 @@ add_subdirectory( kpty ) add_subdirectory( kdesu ) add_subdirectory( kio ) add_subdirectory( solid ) -add_subdirectory( kded ) +add_subdirectory( kded ) add_subdirectory( kfile ) -add_subdirectory( kioslave ) -add_subdirectory( kparts ) -add_subdirectory( kutils ) -add_subdirectory( licenses ) -add_subdirectory( mimetypes ) -add_subdirectory( kinit ) +add_subdirectory( kioslave ) +add_subdirectory( kparts ) +add_subdirectory( kutils ) +add_subdirectory( licenses ) +add_subdirectory( mimetypes ) +add_subdirectory( kinit ) add_subdirectory( threadweaver ) -add_subdirectory( sonnet ) -add_subdirectory( interfaces ) -add_subdirectory( kdewidgets ) +add_subdirectory( sonnet ) +add_subdirectory( interfaces ) +add_subdirectory( kdewidgets ) add_subdirectory( knotify ) add_subdirectory( kimgio ) add_subdirectory( dnssd ) diff --git a/CONFLICTS b/CONFLICTS deleted file mode 100644 index 6e0bd979..00000000 --- a/CONFLICTS +++ /dev/null @@ -1,30 +0,0 @@ -List of remaining conflicts between kdelibs3 and kdelibs4 - -NONE! - -List of solved conflicts: - -bin/ktradertest -> kdebase/runtime/ktraderclient - Note that kdebase/runtime will be installed as well, so it can't conflict with kdelibs3 either. -bin/kde-menu -> user tool (debugging, scripts, GUI feedback after install) -> kdebase/runtime/kde-menu, as kde4-menu. -bin/kstartupconfig -> kdebase/workspace -bin/kdostartupconfig -> kdebase/workspace - -bin/kded -> kded4 - DONE -bin/kcookiejar -> kcookiejar4 - DONE (not used by khtml anymore, only a command-line tool) - -bin/kdesu_stub -> libexec - DONE -bin/kaddprinterwizard -> libexec - DONE (started by a kicker menuext; wrapper around libkdeprint functionality) -bin/kio_http_cache_cleaner -> libexec - DONE -bin/kdontchangethehostname -> libexec - DONE -bin/klauncher -> libexec - DONE -bin/kpac_dhcp_helper -> libexec - DONE -bin/ksendbugmail -> libexec - DONE -bin/kconf_update -> libexec - DONE (started by kded) - -bin/cupsdoprint -> libexec - DONE -bin/ksvgtopng -> devel only, doesn't matter -bin/kunittestmodrunner -> devel only, and for compat so it can't be renamed/moved -bin/makekdewidgets -> devel only, doesn't matter -bin/kconfig_compiler -> devel only, doesn't matter -bin/preparetips -> devel only perhaps? diff --git a/CTestConfig.cmake b/CTestConfig.cmake deleted file mode 100644 index 4b3625af..00000000 --- a/CTestConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(Dart) -set(CTEST_PROJECT_NAME "kdelibs") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kdelibs") -set(CTEST_DROP_SITE_CDASH TRUE) diff --git a/CTestCustom.cmake b/CTestCustom.cmake deleted file mode 100644 index b4462c76..00000000 --- a/CTestCustom.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# This file contains all the specific settings that will be used -# when running 'make Experimental' or 'make ExperimentalBuild' - -# Change the maximum warnings that will be displayed -# on the report page (default 50) -set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000) - -set(CTEST_CUSTOM_WARNING_EXCEPTION "kdecore/network/k3socket[a-z]+\\.h" - "kdecore/network/k3clientsocketbase\\.h" - "Warning: No relevant classes found. No output generated." # moc didn't find anything to do - "yy" "YY" # ignore the warnings in generated code - ) -set(CTEST_CUSTOM_ERROR_EXCEPTION "ICECC") -set(CTEST_CUSTOM_COVERAGE_EXCLUDE ".moc$" "moc_" "ui_") diff --git a/KDELibsNightly.cmake b/KDELibsNightly.cmake deleted file mode 100644 index cca25c1b..00000000 --- a/KDELibsNightly.cmake +++ /dev/null @@ -1,93 +0,0 @@ -# This is a script for running a Nightly build of kdelibs. -# It is ready for testing. -# To adapt it for other projects, basically only the KDE_CTEST_VCS_REPOSITORY variable -# has to be changed. -# -# It uses the file KDECTestNightly.cmake, which is in KDE svn in kdesdk/cmake/modules/. -# You need to have this file on some location on your system and then point the environment variable -# KDECTESTNIGHTLY_DIR to the directory containing this file when running this script. -# -# At the bottom of this file you can find (commented out) a simple shell script which -# I use to drive the Nightly builds on my machine. You have to adapt this to the -# conditions on your system, then you can run it e.g. via cron. -# -# Alex - -# The VCS of KDE is "svn", also specify the repository -set(KDE_CTEST_VCS svn) -set(KDE_CTEST_VCS_REPOSITORY https://svn.kde.org/home/kde/trunk/KDE/kdelibs) - -# for now hardcode the generator to "Unix Makefiles" -set(CTEST_CMAKE_GENERATOR "Unix Makefiles" ) - - -# generic support code, provides the kde_ctest_setup() macro, which sets up everything required: -file(TO_CMAKE_PATH $ENV{KDECTESTNIGHTLY_DIR} KDECTESTNIGHTLY_DIR) -include( "${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake" OPTIONAL RESULT_VARIABLE fileIncluded) - -if(NOT fileIncluded) - message(FATAL_ERROR "Did not find file ${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake . Set the environment variable KDECTESTNIGHTLY_DIR to the directory where this file is located. In KDE svn it is in kdesdk/cmake/modules/ ") -endif(NOT fileIncluded) - -# set up binary dir, source dir, etc. -kde_ctest_setup("${CMAKE_CURRENT_LIST_FILE}") - -# now actually do the Nightly -ctest_empty_binary_directory("${CTEST_BINARY_DIRECTORY}") -ctest_start(Nightly) -ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}" ) - -# read some settings -include("${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake") -include("${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake" OPTIONAL) - -# build the tests -set(KDE4_BUILD_TESTS TRUE) - -# if CMAKE_INSTALL_PREFIX and BUILD_experimental were defined on the command line, put them -# in the initial cache, so cmake gets them -kde_ctest_write_initial_cache("${CTEST_BINARY_DIRECTORY}" CMAKE_INSTALL_PREFIX - BUILD_experimental - KDE4_BUILD_TESTS) - -# configure, build, test, submit -ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_submit() - -# optionally install afterwards, so additional nightly builds can use this current install -# (e.g. kdepimlibs could use this kdelibs install) -if(DO_INSTALL) - kde_ctest_install("${CTEST_BINARY_DIRECTORY}" ) -endif(DO_INSTALL) - - -############################################################################################ -# -# ------------8<-----------------8<---------------------8<---------------------8<----------- -# #!/bin/sh -# -# # point to the directory where KDECTestNightly.cmake is located (in svn: kdesvn/cmake/modules/ ) -# export KDECTESTNIGHTLY_DIR=/home/alex/src/kde4-svn/KDE\ dir/kdesdk/cmake/modules/ -# -# -# # Set which ctest will be used, where the results should be installed to, and which suffix the -# # build name on my.cdash.org should get: -# CTEST=/opt/cmake-2.6.2-Linux-i386/bin/ctest -# INSTALL_ROOT=/home/alex/Dashboards/installs/2.6.2 -# SUFFIX=cmake-2.6.2 -# -# # set CMAKE_PREFIX_PATH so that everything necessary for building automoc4 will be found: -# export CMAKE_PREFIX_PATH=/opt/qt-4.5/qt/ -# -# $CTEST -V -VV -S ~/src/kde4-svn/kdesupport/automoc/Automoc4Nightly.cmake,KDE_CTEST_BUILD_SUFFIX=$SUFFIX,CMAKE_INSTALL_PREFIX=$INSTALL_ROOT/automoc4,DO_INSTALL=TRUE -# -# # For building kdelibs we need more stuff in CMAKE_PREFIX_PATH: -# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:$INSTALL_ROOT/automoc4 -# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/opt/shared-mime-info -# export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/opt/kdesupport/ -# -# $CTEST -V -VV -S ~/src/kde4-svn/KDE\ dir/kdelibs/KDELibsNightly.cmake,KDE_CTEST_BUILD_SUFFIX=$SUFFIX,CMAKE_INSTALL_PREFIX=$INSTALL_ROOT/kdelibs,DO_INSTALL=TRUE -# -# ------------8<-----------------8<---------------------8<---------------------8<----------- diff --git a/config-prefix.h.cmake b/config-prefix.h.cmake index 1845d613..d444d82a 100644 --- a/config-prefix.h.cmake +++ b/config-prefix.h.cmake @@ -32,7 +32,6 @@ #define EXEC_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}" #define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}" #define LOCALE_INSTALL_DIR "${LOCALE_INSTALL_DIR}" -#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}" /* Only used by KStandardDirs */ #define APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt index 8440b4f0..3c38a212 100644 --- a/experimental/CMakeLists.txt +++ b/experimental/CMakeLists.txt @@ -1,25 +1,4 @@ project( KDELIBS_EXPERIMENTAL ) -# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) - -if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - set(BUILDING_EXPERIMENTAL_SEPARATELY TRUE) -endif(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - -if(BUILDING_EXPERIMENTAL_SEPARATELY) - find_package(KDE4 4.2.85 REQUIRED) - include(MacroLibrary) - include(KDE4Defaults) -else(BUILDING_EXPERIMENTAL_SEPARATELY) - include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${KDE4_KDEUI_INCLUDES}) -endif(BUILDING_EXPERIMENTAL_SEPARATELY) - - -if(BUILDING_EXPERIMENTAL_SEPARATELY) - macro_display_feature_log() -endif(BUILDING_EXPERIMENTAL_SEPARATELY) - - +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_KDEUI_INCLUDES}) add_subdirectory(libkdeclarative) diff --git a/experimental/CTestConfig.cmake b/experimental/CTestConfig.cmake deleted file mode 100644 index c383ee18..00000000 --- a/experimental/CTestConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ -## This file should be placed in the root directory of your project. -## Then modify the CMakeLists.txt file in the root directory of your -## project to incorporate the testing dashboard. -## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(Dart) -set(CTEST_PROJECT_NAME "kdelibs-experimental") -set(CTEST_NIGHTLY_START_TIME "20:00:00 CET") - -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "my.cdash.org") -set(CTEST_DROP_LOCATION "/submit.php?project=kdelibs-experimental") -set(CTEST_DROP_SITE_CDASH TRUE) - -set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1000) -set(CTEST_CUSTOM_WARNING_EXCEPTION "kdecore/network/k3socket[a-z]+\\.h" - "kdecore/network/k3clientsocketbase\\.h" ) diff --git a/experimental/KDELibsExperimentalNightly.cmake b/experimental/KDELibsExperimentalNightly.cmake deleted file mode 100644 index fd53e0c5..00000000 --- a/experimental/KDELibsExperimentalNightly.cmake +++ /dev/null @@ -1,56 +0,0 @@ -# This is a script for running a Nightly build of kdelibs/experimental/. -# It is ready for testing. -# To adapt it for other projects, basically only the KDE_CTEST_VCS_REPOSITORY variable -# has to be changed. -# -# It uses the file KDECTestNightly.cmake, which is in KDE svn in kdesdk/cmake/modules/. -# You need to have this file on some location on your system and then point the environment variable -# KDECTESTNIGHTLY_DIR to the directory containing this file when running this script. -# -# For more details have a look at kdelibs/KDELibsNightly.cmake in KDE svn -# -# Alex - -# The VCS of KDE is "svn", also specify the repository -set(KDE_CTEST_VCS svn) -set(KDE_CTEST_VCS_REPOSITORY https://svn.kde.org/home/kde/trunk/KDE/kdelibs/experimental) - -# for now hardcode the generator to "Unix Makefiles" -set(CTEST_CMAKE_GENERATOR "Unix Makefiles" ) - - -# generic support code, provides the kde_ctest_setup() macro, which sets up everything required: -file(TO_CMAKE_PATH $ENV{KDECTESTNIGHTLY_DIR} KDECTESTNIGHTLY_DIR) -include( "${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake" OPTIONAL RESULT_VARIABLE fileIncluded) - -if(NOT fileIncluded) - message(FATAL_ERROR "Did not find file ${KDECTESTNIGHTLY_DIR}/KDECTestNightly.cmake . Set the environment variable KDECTESTNIGHTLY_DIR to the directory where this file is located. In KDE svn it is in kdesdk/cmake/modules/ ") -endif(NOT fileIncluded) - - -# set up binary dir, source dir, etc. -kde_ctest_setup("${CMAKE_CURRENT_LIST_FILE}") - - -# now actually do the Nightly -ctest_empty_binary_directory("${CTEST_BINARY_DIRECTORY}") -ctest_start(Nightly) -ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}" ) - -# read some settings -include("${CTEST_SOURCE_DIRECTORY}/CTestConfig.cmake") -include("${CTEST_SOURCE_DIRECTORY}/CTestCustom.cmake" OPTIONAL) - -# if CMAKE_INSTALL_PREFIX was defined on the command line, put it in the initial cache, so cmake gets it -kde_ctest_write_initial_cache("${CTEST_BINARY_DIRECTORY}" CMAKE_INSTALL_PREFIX ) - -ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" ) -ctest_submit() - -# optionally install afterwards, so additional nightly builds can use this current install -# (e.g. kdepimlibs could use this kdelibs install) -if(DO_INSTALL) - kde_ctest_install("${CTEST_BINARY_DIRECTORY}" ) -endif(DO_INSTALL) diff --git a/kdemacros.h.cmake b/kdemacros.h.cmake index f8746fb0..5e3f9594 100644 --- a/kdemacros.h.cmake +++ b/kdemacros.h.cmake @@ -146,8 +146,7 @@ * syntax. * * \note - * KDE_DEPRECATED cannot be used at the end of the declaration anymore, - * unlike what is done for KDE3. + * KDE_DEPRECATED cannot be used at the end of the declaration * * \note * KDE_DEPRECATED cannot be used for constructors, diff --git a/kdeui/MAINTAINERS b/kdeui/MAINTAINERS deleted file mode 100644 index fa6be34a..00000000 --- a/kdeui/MAINTAINERS +++ /dev/null @@ -1,104 +0,0 @@ -Here are the code maintainers for each part of this library. Any problems or -suggested patches for a class should be directed to the responsible person for -that class. - -When adding yourself as a maintainer, don't be afraid to reorder the files to a -more logical grouping. - -kaboutapplication.cpp -kaboutdialog.cpp -kaboutkde.cpp -kaction.cpp Holger Freyther , Martijn Klingens -kanimwidget.cpp -karrowbutton.cpp Frerich Raabe -kauthicon.cpp -kbugreport.cpp -kbuttonbox.cpp -kcharselect.cpp -kcmenumngr.cpp -kcmodule.cpp -kcolorbutton.cpp -kcolorcombo.cpp -kcolordialog.cpp -kcolordrag.cpp -kcolorscheme.cpp Matthew Woehlke -kcolorutils.cpp Matthew Woehlke -kcombobox.cpp Dawit Alemayehu , Carsten Pfeiffer -kcommand.cpp David Faure -kcompletionbox.cpp Carsten Pfeiffer -kcursor.cpp Carsten Pfeiffer -kdatepicker.cpp -kdatetbl.cpp -kdatetimewidget.cpp Hans Petter Bieker -kdatewidget.cpp -kdcopactionproxy.cpp -kdialog.cpp Olivier Goffart -kdialogbase.cpp -kdockwidget.cpp Joseph Wenninger -kdockwidget_private.cpp Joseph Wenninger -keditlistbox.cpp -kedittoolbar.cpp David Faure -kfontcombo.cpp -kfontdialog.cpp -kglobalsettings.cpp David Faure -kguiitem.cpp Holger Freyther , Martijn Klingens -khelpmenu.cpp -k3iconview.cpp -kjanuswidget.cpp Ravikiran Rajagopal -kkeybutton.cpp Ellis Whitehead -kkeydialog.cpp Ellis Whitehead -kled.cpp -klineedit.cpp Dawit Alemayehu , Carsten Pfeiffer -klistbox.cpp -k3listview.cpp -kmainwindow.cpp -kmainwindowiface.cpp -kmanagerselection.cpp Lubos Lunak -kmenu.cpp Holger Freyther -kmenubar.cpp -kmessagebox.cpp -kmodifierkeyinfo.cpp Michael Leupold -knotification.cpp Olivier Goffert -knuminput.cpp Dirk Mueller -knumvalidator.cpp -kpagedialog.cpp Tobias Koenig -kpageview.cpp Tobias Koenig -kpagewidget.cpp Tobias Koenig -kpanelapplet.cpp -kpanelappmenu.cpp -kpanelextension.cpp -kpanelmenu.cpp -kpassdlg.cpp -kprogressdialog.cpp Urs Wolfer -kpushbutton.cpp Carsten Pfeiffer , Martijn Klingens -krestrictedline.cpp -kruler.cpp -kselect.cpp -kseparator.cpp -kshortcutdialog.cpp Ellis Whitehead -ksqueezedtextlabel.cpp -kstartupinfo.cpp Lubos Lunak -kstatusbar.cpp -kstdaction.cpp -kstdguiitem.cpp Holger Freyther , Martijn Klingens -kstringvalidator.cpp Marc Mutz -ksystemtray.cpp -ktabctl.cpp -ktextbrowser.cpp -ktip.cpp -ktoolbar.cpp -kurllabel.cpp -kwindowlistmenu.cpp -kassistantdialog.cpp -kwallet.cpp Michael Leupold -kwindowinfo_x11.cpp Lubos Lunak -kwindowsystem_x11.cpp Lubos Lunak -kwordwrap.cpp David Faure -kxerrorhandler.cpp Lubos Lunak -kxmessages.cpp Lubos Lunak -kxmlguibuilder.cpp -kxmlguiclient.cpp -kxmlguifactory.cpp -kxutils.cpp Lubos Lunak -netwm.cpp Lubos Lunak -qxembed.cpp diff --git a/kdeui/fonts/kfontchooser.cpp b/kdeui/fonts/kfontchooser.cpp index 30e30514..f24e306e 100644 --- a/kdeui/fonts/kfontchooser.cpp +++ b/kdeui/fonts/kfontchooser.cpp @@ -92,10 +92,6 @@ public: customSizeRow = -1; } - // pointer to an optinally supplied list of fonts to - // inserted into the fontdialog font-family combo-box -// QStringList fontList; - void setFamilyBoxItems(const QStringList &fonts); void fillFamilyListBox(bool onlyFixedFonts = false); int nearestSizeRow(qreal val, bool customize); diff --git a/kdeui/make_kdepackages.sh b/kdeui/make_kdepackages.sh deleted file mode 100755 index b3ed36b8..00000000 --- a/kdeui/make_kdepackages.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -rm kdepackages.h -curl "http://bugs.kde.org/xml.cgi?data=versiontable" > tmp_kdepackages_download -echo "// DO NOT EDIT - EDIT bugs/Maintainers instead" > kdepackages.h -echo "const char * const packages[] = {" >> kdepackages.h -cat tmp_kdepackages_download | egrep "" | \ - sed -e "s,,product=\"\1\"; component=\"general\",; \ - s#\([^<]*\)#component=\"\1\"#" > tmp_kdepackages_download2 -(while read i; do eval $i; echo "\"$product/$component\","; done) < tmp_kdepackages_download2 | \ - sed -e "s,/general\",/00general\"," | LC_ALL=C sort -u | \ - grep -v 'valgrind/' | sed -e "s,/00general\",\"," >> kdepackages.h -echo "0 };" >> kdepackages.h -rm tmp_kdepackages_download2 tmp_kdepackages_download diff --git a/kdeui/tests/krichtexteditor/CMakeLists.txt b/kdeui/tests/krichtexteditor/CMakeLists.txt index 0855e356..9d1abb96 100644 --- a/kdeui/tests/krichtexteditor/CMakeLists.txt +++ b/kdeui/tests/krichtexteditor/CMakeLists.txt @@ -1,19 +1,17 @@ -PROJECT( krichtexteditor ) +PROJECT(krichtexteditor) FIND_PACKAGE(KDE4 REQUIRED) -INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) SET(krichtexteditorSources - main.cpp - krichtexteditor.cpp - ) + main.cpp + krichtexteditor.cpp +) -KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources} ) -TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ) +KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources}) +TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}) install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR}) -install(FILES - krichtexteditorui.rc - DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor) +install(FILES krichtexteditorui.rc DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor) diff --git a/kdeui/xmlgui/kxmlguiwindow.cpp b/kdeui/xmlgui/kxmlguiwindow.cpp index 771a4ca6..2f85d996 100644 --- a/kdeui/xmlgui/kxmlguiwindow.cpp +++ b/kdeui/xmlgui/kxmlguiwindow.cpp @@ -101,7 +101,7 @@ QAction *KXmlGuiWindow::toolBarMenuAction() { K_D(KXmlGuiWindow); if ( !d->toolBarHandler ) - return 0; + return 0; return d->toolBarHandler->toolBarMenuAction(); } diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index cefb4caf..c9c66195 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -381,7 +381,7 @@ void KParts::BrowserRun::saveUrl(const KUrl & url, const QString & suggestedFile if (!downloadManger.isEmpty()) { // then find the download manager location - kDebug(1000) << "Using: "<