Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source
This commit is contained in:
Ivailo Monev 2015-08-26 07:41:39 +03:00
parent f52e025ee1
commit 6ee471194f
16 changed files with 22 additions and 397 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
CMakeLists.txt
View file

@ -25,11 +25,6 @@ if(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
set(KDE_NO_DEPRECATED TRUE) set(KDE_NO_DEPRECATED TRUE)
endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED) 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 ################# ################# now find all used packages #################
set (QT_MIN_VERSION "4.8.2") set (QT_MIN_VERSION "4.8.2")
@ -226,18 +221,18 @@ add_subdirectory( kpty )
add_subdirectory( kdesu ) add_subdirectory( kdesu )
add_subdirectory( kio ) add_subdirectory( kio )
add_subdirectory( solid ) add_subdirectory( solid )
add_subdirectory( kded ) add_subdirectory( kded )
add_subdirectory( kfile ) add_subdirectory( kfile )
add_subdirectory( kioslave ) add_subdirectory( kioslave )
add_subdirectory( kparts ) add_subdirectory( kparts )
add_subdirectory( kutils ) add_subdirectory( kutils )
add_subdirectory( licenses ) add_subdirectory( licenses )
add_subdirectory( mimetypes ) add_subdirectory( mimetypes )
add_subdirectory( kinit ) add_subdirectory( kinit )
add_subdirectory( threadweaver ) add_subdirectory( threadweaver )
add_subdirectory( sonnet ) add_subdirectory( sonnet )
add_subdirectory( interfaces ) add_subdirectory( interfaces )
add_subdirectory( kdewidgets ) add_subdirectory( kdewidgets )
add_subdirectory( knotify ) add_subdirectory( knotify )
add_subdirectory( kimgio ) add_subdirectory( kimgio )
add_subdirectory( dnssd ) add_subdirectory( dnssd )

30
CONFLICTS
View file

@ -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?

13
CTestConfig.cmake
View file

@ -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)

14
CTestCustom.cmake
View file

@ -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_")

93
KDELibsNightly.cmake
View file

@ -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 <neundorf AT kde.org>
# 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<-----------

1
config-prefix.h.cmake
View file

@ -32,7 +32,6 @@
#define EXEC_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}" #define EXEC_INSTALL_PREFIX "${EXEC_INSTALL_PREFIX}"
#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}" #define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}"
#define LOCALE_INSTALL_DIR "${LOCALE_INSTALL_DIR}" #define LOCALE_INSTALL_DIR "${LOCALE_INSTALL_DIR}"
#define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}"
/* Only used by KStandardDirs */ /* Only used by KStandardDirs */
#define APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" #define APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk"

23
experimental/CMakeLists.txt
View file

@ -1,25 +1,4 @@
project( KDELIBS_EXPERIMENTAL ) project( KDELIBS_EXPERIMENTAL )
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDE4_KDEUI_INCLUDES})
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)
add_subdirectory(libkdeclarative) add_subdirectory(libkdeclarative)

17
experimental/CTestConfig.cmake
View file

@ -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" )

56
experimental/KDELibsExperimentalNightly.cmake
View file

@ -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 <neundorf AT kde.org>
# 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)

3
kdemacros.h.cmake
View file

@ -146,8 +146,7 @@
* syntax. * syntax.
* *
* \note * \note
* KDE_DEPRECATED cannot be used at the end of the declaration anymore, * KDE_DEPRECATED cannot be used at the end of the declaration
* unlike what is done for KDE3.
* *
* \note * \note
* KDE_DEPRECATED cannot be used for constructors, * KDE_DEPRECATED cannot be used for constructors,

104
kdeui/MAINTAINERS
View file

@ -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 <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
kanimwidget.cpp
karrowbutton.cpp Frerich Raabe <raabe@kde.org>
kauthicon.cpp
kbugreport.cpp
kbuttonbox.cpp
kcharselect.cpp
kcmenumngr.cpp
kcmodule.cpp
kcolorbutton.cpp
kcolorcombo.cpp
kcolordialog.cpp
kcolordrag.cpp
kcolorscheme.cpp Matthew Woehlke <mw_triad@users.sourceforge.net>
kcolorutils.cpp Matthew Woehlke <mw_triad@users.sourceforge.net>
kcombobox.cpp Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
kcommand.cpp David Faure <faure@kde.org>
kcompletionbox.cpp Carsten Pfeiffer <pfeiffer@kde.org>
kcursor.cpp Carsten Pfeiffer <pfeiffer@kde.org>
kdatepicker.cpp
kdatetbl.cpp
kdatetimewidget.cpp Hans Petter Bieker <bieker@kde.org>
kdatewidget.cpp
kdcopactionproxy.cpp
kdialog.cpp Olivier Goffart <ogoffart@kde.org>
kdialogbase.cpp
kdockwidget.cpp Joseph Wenninger <jowenn@kde.org>
kdockwidget_private.cpp Joseph Wenninger <jowenn@kde.org>
keditlistbox.cpp
kedittoolbar.cpp David Faure <faure@kde.org>
kfontcombo.cpp
kfontdialog.cpp
kglobalsettings.cpp David Faure <faure@kde.org>
kguiitem.cpp Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
khelpmenu.cpp
k3iconview.cpp
kjanuswidget.cpp Ravikiran Rajagopal <ravi@ee.eng.ohio-state.edu>
kkeybutton.cpp Ellis Whitehead <ellis@kde.org>
kkeydialog.cpp Ellis Whitehead <ellis@kde.org>
kled.cpp
klineedit.cpp Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
klistbox.cpp
k3listview.cpp
kmainwindow.cpp
kmainwindowiface.cpp
kmanagerselection.cpp Lubos Lunak <l.lunak@kde.org>
kmenu.cpp Holger Freyther <freyther@kde.org>
kmenubar.cpp
kmessagebox.cpp
kmodifierkeyinfo.cpp Michael Leupold <lemma@confuego.org>
knotification.cpp Olivier Goffert <ogoffart@kde.org>
knuminput.cpp Dirk Mueller <mueller@kde.org>
knumvalidator.cpp
kpagedialog.cpp Tobias Koenig <tokoe@kde.org>
kpageview.cpp Tobias Koenig <tokoe@kde.org>
kpagewidget.cpp Tobias Koenig <tokoe@kde.org>
kpanelapplet.cpp
kpanelappmenu.cpp
kpanelextension.cpp
kpanelmenu.cpp
kpassdlg.cpp
kprogressdialog.cpp Urs Wolfer <uwolfer @ fwo.ch>
kpushbutton.cpp Carsten Pfeiffer <pfeiffer@kde.org>, Martijn Klingens <klingens@kde.org>
krestrictedline.cpp
kruler.cpp
kselect.cpp
kseparator.cpp
kshortcutdialog.cpp Ellis Whitehead <ellis@kde.org>
ksqueezedtextlabel.cpp
kstartupinfo.cpp Lubos Lunak <l.lunak@kde.org>
kstatusbar.cpp
kstdaction.cpp
kstdguiitem.cpp Holger Freyther <freyther@kde.org>, Martijn Klingens <klingens@kde.org>
kstringvalidator.cpp Marc Mutz <mutz@kde.org>
ksystemtray.cpp
ktabctl.cpp
ktextbrowser.cpp
ktip.cpp
ktoolbar.cpp
kurllabel.cpp
kwindowlistmenu.cpp
kassistantdialog.cpp
kwallet.cpp Michael Leupold <lemma@confuego.org>
kwindowinfo_x11.cpp Lubos Lunak <l.lunak@kde.org>
kwindowsystem_x11.cpp Lubos Lunak <l.lunak@kde.org>
kwordwrap.cpp David Faure <faure@kde.org>
kxerrorhandler.cpp Lubos Lunak <l.lunak@kde.org>
kxmessages.cpp Lubos Lunak <l.lunak@kde.org>
kxmlguibuilder.cpp
kxmlguiclient.cpp
kxmlguifactory.cpp
kxutils.cpp Lubos Lunak <l.lunak@kde.org>
netwm.cpp Lubos Lunak <l.lunak@kde.org>
qxembed.cpp

4
kdeui/fonts/kfontchooser.cpp
View file

@ -92,10 +92,6 @@ public:
customSizeRow = -1; 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 setFamilyBoxItems(const QStringList &fonts);
void fillFamilyListBox(bool onlyFixedFonts = false); void fillFamilyListBox(bool onlyFixedFonts = false);
int nearestSizeRow(qreal val, bool customize); int nearestSizeRow(qreal val, bool customize);

14
kdeui/make_kdepackages.sh
View file

@ -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 "<product|<component" | grep -v "</product>" | \
sed -e "s,<product name=\"\([^\"]*\)\">,product=\"\1\"; component=\"general\",; \
s#<component>\([^<]*\)</component>#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

18
kdeui/tests/krichtexteditor/CMakeLists.txt
View file

@ -1,19 +1,17 @@
PROJECT( krichtexteditor ) PROJECT(krichtexteditor)
FIND_PACKAGE(KDE4 REQUIRED) FIND_PACKAGE(KDE4 REQUIRED)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
SET(krichtexteditorSources SET(krichtexteditorSources
main.cpp main.cpp
krichtexteditor.cpp krichtexteditor.cpp
) )
KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources} ) KDE4_ADD_EXECUTABLE(krichtexteditor ${krichtexteditorSources})
TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ) TARGET_LINK_LIBRARIES(krichtexteditor ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR}) install(TARGETS krichtexteditor DESTINATION ${BIN_INSTALL_DIR})
install(FILES install(FILES krichtexteditorui.rc DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor)
krichtexteditorui.rc
DESTINATION ${DATA_INSTALL_DIR}/krichtexteditor)

2
kdeui/xmlgui/kxmlguiwindow.cpp
View file

@ -101,7 +101,7 @@ QAction *KXmlGuiWindow::toolBarMenuAction()
{ {
K_D(KXmlGuiWindow); K_D(KXmlGuiWindow);
if ( !d->toolBarHandler ) if ( !d->toolBarHandler )
return 0; return 0;
return d->toolBarHandler->toolBarMenuAction(); return d->toolBarHandler->toolBarMenuAction();
} }

2
kparts/browserrun.cpp
View file

@ -381,7 +381,7 @@ void KParts::BrowserRun::saveUrl(const KUrl & url, const QString & suggestedFile
if (!downloadManger.isEmpty()) if (!downloadManger.isEmpty())
{ {
// then find the download manager location // then find the download manager location
kDebug(1000) << "Using: "<<downloadManger <<" as Download Manager"; kDebug(1000) << "Using: " << downloadManger << " as Download Manager";
QString cmd=KStandardDirs::findExe(downloadManger); QString cmd=KStandardDirs::findExe(downloadManger);
if (cmd.isEmpty()) if (cmd.isEmpty())
{ {