Commit eae30b11 authored by Dirk Mueller's avatar Dirk Mueller
Browse files

- move libkonq into apps/

- partial fixes to make apps build separately

svn path=/trunk/KDE/kdebase/apps/; revision=680304
parent 8869eb21
project(KDEBASE_APPS)
#search packages used by KDE
find_package(KDE4 REQUIRED)
find_package(Strigi REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
include(MacroOptionalAddSubdirectory)
configure_file (config-apps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-apps.h )
include_directories (${CMAKE_CURRENT_BINARY_DIR})
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DHAVE_CONFIG_H=1)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/lib/konq ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
add_subdirectory( lib )
add_subdirectory( dolphin )
add_subdirectory( kwrite )
add_subdirectory( kdialog )
......
/* config-apps.h. Generated by cmake from config-apps.h.cmake */
/* Define to 1 if you have the `getpeereid' function. */
#cmakedefine HAVE_GETPEEREID 1
/* Defines if you have Solaris' libkstat */
/* #undef HAVE_KSTAT */
/* Define if you have long long as datatype */
#define HAVE_LONG_LONG 1
/* Define to 1 if you have the `nice' function. */
#define HAVE_NICE 1
/* Define to 1 if you have the <sasl.h> header file. */
#cmakedefine HAVE_SASL_H 1
/* Define to 1 if you have the <sasl/sasl.h> header file. */
#cmakedefine HAVE_SASL_SASL_H 1
/* Define to 1 if you have the `setpriority' function. */
#cmakedefine HAVE_SETPRIORITY 1
/* Define to 1 if you have the `sigaction' function. */
#define HAVE_SIGACTION 1
/* Define to 1 if you have the `sigset' function. */
#define HAVE_SIGSET 1
/* Define to 1 if you have the <string.h> header file. */
#cmakedefine HAVE_STRING_H 1
/* Define if you have the struct ucred */
#cmakedefine HAVE_STRUCT_UCRED 1
/* Define to 1 if you have the <sys/loadavg.h> header file. */
#cmakedefine HAVE_SYS_LOADAVG_H 1
/* Define to 1 if you have the <sys/select.h> header file. */
#cmakedefine HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/socket.h> header file. */
#cmakedefine HAVE_SYS_SOCKET_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
#cmakedefine HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#cmakedefine HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <sys/wait.h> header file. */
#cmakedefine HAVE_SYS_WAIT_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#cmakedefine HAVE_UNISTD_H 1
/* Define if you have unsetenv */
#cmakedefine HAVE_UNSETENV 1
/* Define if you have the unsetenv prototype */
#cmakedefine HAVE_UNSETENV_PROTO 1
/* Define if you have usleep */
#cmakedefine HAVE_USLEEP 1
/* Define if you have the usleep prototype */
#cmakedefine HAVE_USLEEP_PROTO 1
/* Define to 1 if you have the `vsnprintf' function. */
#cmakedefine HAVE_VSNPRINTF 1
/* KDE's binaries directory */
#define KDE_BINDIR "${CMAKE_INSTALL_PREFIX}/bin"
/* KDE's configuration directory */
#define KDE_CONFDIR "${CMAKE_INSTALL_PREFIX}/share/config"
/* KDE's static data directory */
#define KDE_DATADIR "${CMAKE_INSTALL_PREFIX}/share/apps"
/* Define where your java executable is */
#undef PATH_JAVA
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#cmakedefine TIME_WITH_SYS_TIME 1
/* Define the file for utmp entries */
#define UTMP "${UTMP_FILE}"
/* X binaries directory */
#define XBINDIR "/usr/X11R6/bin"
/* X libraries directory */
#define XLIBDIR "/usr/X11R6/lib/X11"
/* Number of bits in a file offset, on hosts where this is settable. */
#define _FILE_OFFSET_BITS 64
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
/* type to use in place of socklen_t if not defined */
#define kde_socklen_t socklen_t
......@@ -10,7 +10,7 @@
#include "passwd.h"
#include <config.h> // setenv
#include <config-apps.h> // setenv
#include <stdio.h>
#include <stdlib.h>
......
......@@ -49,7 +49,7 @@
#include <QtCore/QRegExp>
#include <QtCore/QDate>
#include <config.h>
#include <config-apps.h>
class KonqIconViewFactory : public KParts::Factory
{
......
......@@ -35,9 +35,7 @@
#include <kglobal.h>
#include <klocale.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <config-apps.h>
typedef KGenericFactory<SMBRoOptions> SMBRoOptionsFactory;
K_EXPORT_COMPONENT_FACTORY(smb, SMBRoOptionsFactory("kcmkio"))
......
......@@ -49,7 +49,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <config.h>
#include <config-apps.h>
......
......@@ -22,9 +22,7 @@
#ifndef _SOCKS_H
#define _SOCKS_H
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <config-apps.h>
#include <kcmodule.h>
......
......@@ -15,7 +15,7 @@ set(kcm_konq_PART_SRCS
if(Q_WS_X11)
set(kcm_konq_PART_SRCS desktop.cpp ${kcm_konq_PART_SRCS})
set(kdesktop_xml ${CMAKE_SOURCE_DIR}/workspace/kdesktop/org.kde.kdesktop.Desktop.xml)
set(kdesktop_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/kdesktop/org.kde.kdesktop.Desktop.xml)
QT4_ADD_DBUS_INTERFACE( kcm_konq_PART_SRCS ${kdesktop_xml} kdesktop_interface )
endif(Q_WS_X11)
......
......@@ -50,7 +50,7 @@
#endif
// Local
#include <config.h>
#include <config-apps.h>
//-----------------------------------------------------------------------------
......
......@@ -20,7 +20,7 @@
#include <QtGui/QLabel>
// KDE
#include <config.h>
#include <config-apps.h>
#include <k3listview.h>
#include <kurlrequester.h>
#include <kdebug.h>
......
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory( trees )
add_subdirectory( web_module )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/kate/lib )
########### next target ###############
......
......@@ -49,7 +49,7 @@
#include "konqsidebar.h"
// Local
#include <config.h>
#include <config-apps.h>
......
......@@ -5,12 +5,10 @@ set(libkonq_sidebar_tree_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/konq_sidebartreetoplevelitem.cpp
)
add_subdirectory( init )
add_subdirectory( dirtree_module )
add_subdirectory( history_module )
add_subdirectory( bookmark_module )
include_directories( ${CMAKE_SOURCE_DIR}/libkonq ${CMAKE_SOURCE_DIR}/apps/konqueror ${CMAKE_SOURCE_DIR}/apps/konqueror/sidebar/ )
add_subdirectory( init )
add_subdirectory( dirtree_module )
add_subdirectory( history_module )
add_subdirectory( bookmark_module )
########### next target ###############
......
include_directories( ${CMAKE_SOURCE_DIR}/apps/konqueror/sidebar/ ${CMAKE_SOURCE_DIR}/libkonq )
########### next target ###############
......
add_subdirectory (konq)
[Desktop Entry]
Encoding=UTF-8
MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=camera_mount
UnmountIcon=camera_unmount
[Desktop Entry]
Encoding=UTF-8
MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=cdrom_mount
UnmountIcon=cdrom_unmount
Actions=Eject;
X-KDE-Priority=TopLevel
[Desktop Action Eject]
Name=Eject
Name[af]=Uitskiet
Name[ar]=أقذف
Name[be]=Выштурхнуць
Name[bg]=Изваждане
Name[br]=Stlepel
Name[ca]=Expulsa
Name[cs]=Vysunout
Name[csb]=Wësënie
Name[cy]=Allfwrw
Name[da]=Skub ud
Name[de]=Auswerfen
Name[el]=Εξαγωγή
Name[eo]=Eligo
Name[es]=Expulsar
Name[et]=Väljastamine
Name[eu]=Egotzi
Name[fa]=پس زدن
Name[fi]=Poista
Name[fr]=Éjecter
Name[fy]=Utsmytknop
Name[ga]=Díchuir
Name[gl]=Expulsar
Name[he]=הוצא
Name[hr]=Izbaci
Name[hu]=Kidobás
Name[is]=Henda út
Name[it]=Espelli
Name[ja]=取り出し
Name[ka]=CD-ს ამოღება
Name[kk]=Алып-шығару
Name[km]=ច្រាន​ចេញ
Name[ko]=꺼내기
Name[lt]=Išmesti
Name[lv]=Izņemt
Name[mk]=Извади
Name[ms]=Lenting
Name[nb]=Løs ut
Name[nds]=Rutsmieten
Name[ne]=निकाल्नुहोस्
Name[nl]=Uitwerpen
Name[nn]=Løys ut
Name[pa]=ਬਾਹਰ ਕੱਢੋ
Name[pl]=Wysuń
Name[pt_BR]=Ejetar
Name[ro]=Ejectează
Name[ru]=Извлечь CD
Name[se]=Bálkes olggos
Name[sl]=Izvrzi
Name[sr]=Избаци
Name[sr@latin]=Izbaci
Name[sv]=Mata ut
Name[ta]=வெளித்தள்
Name[te]=ఎజెక్ట్
Name[tg]=Ихроҷ
Name[th]=เอาแผ่นออก
Name[tr]=Çıkart
Name[uk]=Виштовхнути
Name[uz]=Чиқариш
Name[wa]=Fé rexhe
Name[x-test]=xxEjectxx
Name[xh]=Khuphela ngaphandle
Name[zh_TW]=退出
Exec=kdeeject %v
[Desktop Entry]
Encoding=UTF-8
MountPoint=
Dev=
ReadOnly=0
Type=FSDevice
Icon=cdwriter_mount
UnmountIcon=cdwriter_unmount
Actions=Eject;
X-KDE-Priority=TopLevel
[Desktop Action Eject]
Name=Eject
Name[af]=Uitskiet
Name[ar]=أقذف
Name[be]=Выштурхнуць
Name[bg]=Изваждане
Name[br]=Stlepel
Name[ca]=Expulsa
Name[cs]=Vysunout
Name[csb]=Wësënie
Name[cy]=Allfwrw
Name[da]=Skub ud
Name[de]=Auswerfen
Name[el]=Εξαγωγή
Name[eo]=Eligo
Name[es]=Expulsar
Name[et]=Väljastamine
Name[eu]=Egotzi
Name[fa]=پس زدن
Name[fi]=Poista
Name[fr]=Éjecter
Name[fy]=Utsmytknop
Name[ga]=Díchuir
Name[gl]=Expulsar
Name[he]=הוצא
Name[hr]=Izbaci
Name[hu]=Kidobás
Name[is]=Henda út
Name[it]=Espelli
Name[ja]=取り出し
Name[ka]=CD-ს ამოღება
Name[kk]=Алып-шығару
Name[km]=ច្រាន​ចេញ
Name[ko]=꺼내기
Name[lt]=Išmesti
Name[lv]=Izņemt
Name[mk]=Извади
Name[ms]=Lenting
Name[nb]=Løs ut
Name[nds]=Rutsmieten
Name[ne]=निकाल्नुहोस्
Name[nl]=Uitwerpen
Name[nn]=Løys ut
Name[pa]=ਬਾਹਰ ਕੱਢੋ
Name[pl]=Wysuń
Name[pt_BR]=Ejetar
Name[ro]=Ejectează
Name[ru]=Извлечь CD
Name[se]=Bálkes olggos
Name[sl]=Izvrzi
Name[sr]=Избаци
Name[sr@latin]=Izbaci
Name[sv]=Mata ut
Name[ta]=வெளித்தள்
Name[te]=ఎజెక్ట్
Name[tg]=Ихроҷ
Name[th]=เอาแผ่นออก
Name[tr]=Çıkart
Name[uk]=Виштовхнути
Name[uz]=Чиқариш
Name[wa]=Fé rexhe
Name[x-test]=xxEjectxx
Name[xh]=Khuphela ngaphandle
Name[zh_TW]=退出
Exec=kdeeject %v
########### install files ###############
install( FILES linkProgram.desktop linkURL.desktop linkFloppy.desktop linkHD.desktop linkCDROM.desktop Directory.desktop TextFile.desktop HTMLFile.desktop linkZIP.desktop linkDVDROM.desktop linkCAMERA.desktop linkNFS.desktop linkCDWRITER.desktop linkMO.desktop DESTINATION ${TEMPLATES_INSTALL_DIR} )
install( FILES Program.desktop URL.desktop Floppy.desktop HD.desktop CDROM-Device.desktop TextFile.txt HTMLFile.html ZIP-Device.desktop DVDROM-Device.desktop CAMERA-Device.desktop NFS.desktop CDWRITER-Device.desktop MO-Device.desktop DESTINATION ${TEMPLATES_INSTALL_DIR}/.source )
[Desktop Entry]
Encoding=UTF-8
MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=dvd_mount
UnmountIcon=dvd_unmount
Actions=Eject;
X-KDE-Priority=TopLevel
[Desktop Action Eject]
Name=Eject
Name[af]=Uitskiet
Name[ar]=أقذف
Name[be]=Выштурхнуць
Name[bg]=Изваждане
Name[br]=Stlepel
Name[ca]=Expulsa
Name[cs]=Vysunout
Name[csb]=Wësënie
Name[cy]=Allfwrw
Name[da]=Skub ud
Name[de]=Auswerfen
Name[el]=Εξαγωγή
Name[eo]=Eligo
Name[es]=Expulsar
Name[et]=Väljastamine
Name[eu]=Egotzi
Name[fa]=پس زدن
Name[fi]=Poista
Name[fr]=Éjecter
Name[fy]=Utsmytknop
Name[ga]=Díchuir
Name[gl]=Expulsar
Name[he]=הוצא
Name[hr]=Izbaci
Name[hu]=Kidobás
Name[is]=Henda út
Name[it]=Espelli
Name[ja]=取り出し
Name[ka]=CD-ს ამოღება
Name[kk]=Алып-шығару
Name[km]=ច្រាន​ចេញ
Name[ko]=꺼내기
Name[lt]=Išmesti
Name[lv]=Izņemt
Name[mk]=Извади
Name[ms]=Lenting
Name[nb]=Løs ut
Name[nds]=Rutsmieten
Name[ne]=निकाल्नुहोस्
Name[nl]=Uitwerpen
Name[nn]=Løys ut
Name[pa]=ਬਾਹਰ ਕੱਢੋ
Name[pl]=Wysuń
Name[pt_BR]=Ejetar
Name[ro]=Ejectează
Name[ru]=Извлечь CD
Name[se]=Bálkes olggos
Name[sl]=Izvrzi
Name[sr]=Избаци
Name[sr@latin]=Izbaci
Name[sv]=Mata ut
Name[ta]=வெளித்தள்
Name[te]=ఎజెక్ట్
Name[tg]=Ихроҷ
Name[th]=เอาแผ่นออก
Name[tr]=Çıkart
Name[uk]=Виштовхнути
Name[uz]=Чиқариш
Name[wa]=Fé rexhe
Name[x-test]=xxEjectxx
Name[xh]=Khuphela ngaphandle
Name[zh_TW]=退出
Exec=kdeeject %v
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment