Commit graph

47 commits

Author SHA1 Message Date
Andreas Pakulat
39e322fc83 Merge the KConfig branch. This are the 3 main modules (+kdeadmin), which are
needed now because friday is the last BC day. The rest of the modules will
follow as fast as my laptop allows.

svn path=/trunk/KDE/kdebase/workspace/; revision=721704
2007-10-05 22:21:25 +00:00
Allen Winter
5c93175949 remove kde4_automoc()
svn path=/trunk/KDE/kdebase/workspace/; revision=685984
2007-07-10 09:14:12 +00:00
Laurent Montel
1c8fa826ed Fix signal/slot
(but we don't use argument, perhaps we can cleanup it)

svn path=/trunk/KDE/kdebase/workspace/; revision=663562
2007-05-11 15:49:22 +00:00
Luboš Luňák
2c539daa5d Merging from old trunk:
r598290 | mlaurent | 2006-10-23 08:53:27 +0200 (Mon, 23 Oct 2006) | 5 lines

Apply Alex patch (now we can use enable-final argument
some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro


svn path=/trunk/KDE/kdebase/workspace/; revision=659295
2007-04-29 22:04:13 +00:00
Luboš Luňák
f52b8e48cd branches/work/kwin_composite becomes new trunk kwin.
svn path=/trunk/KDE/kdebase/workspace/; revision=659202
2007-04-29 17:35:43 +00:00
Luboš Luňák
2b7e1f4993 Remove kwin, kwin_composite will become new trunk kwin, missing merges
from trunk will be merged in.


svn path=/trunk/KDE/kdebase/workspace/; revision=659200
2007-04-29 17:34:49 +00:00
Laurent Montel
1adecf7737 Fix install icons
Fix install lib under x86_64
Fix install include (remove deprecated cmake macro)
Cleanup

svn path=/branches/work/kwin_composite/; revision=655792
2007-04-19 11:52:53 +00:00
Laurent Montel
a0133cb048 Now we don't install libtool file
svn path=/branches/work/kwin_composite/; revision=642555
2007-03-14 17:26:32 +00:00
Barış Metin
12d1b8b0fd setGroup to KConfigGroup
svn path=/trunk/KDE/kdebase/workspace/; revision=635823
2007-02-21 02:59:04 +00:00
Dirk Mueller
6c224134db porting simplifications regarding KConfig::readEntry
svn path=/branches/work/kwin_composite/; revision=632199
2007-02-10 09:12:35 +00:00
Alexander Neundorf
cd5d04d060 -remove kde4_install_libtool_file(), not necessary anymore since we switched away from libltdl
Alex


svn path=/trunk/KDE/kdebase/workspace/; revision=602118
2006-11-05 12:24:44 +00:00
Laurent Montel
b1ce3b0b9e Apply Alex patch (now we can use enable-final argument
some module compiles with enable-final now)
As discussed with Alex it's not necessary to have program name
into automoc macro

svn path=/trunk/KDE/kdebase/workspace/; revision=598290
2006-10-23 06:53:27 +00:00
Luboš Luňák
c16d2e1dff svn merge r595039 from trunk
svn path=/branches/work/kwin_composite/; revision=597698
2006-10-21 12:01:53 +00:00
Laurent Montel
01f2a3a9f2 Necessary to change KDE4_AUTOMOC macro to support
enable-final argument

(there was not a dependancy between <name>_final.cpp file and
moc generated files => moc files were never created)

Not necessary to rebuild all kdelibs just cp kdelibs/cmake/modules/KDE4Macros.cmake <path_kde4>/share/apps/cmake/modules

I ported and tested all kde module (without enable-final argument, it compiles fines (test and program))
Don't try to use enable-final argument for the moment it doesn't compile (but dependancy works)

Regards

svn path=/trunk/KDE/kdebase/workspace/; revision=595039
2006-10-13 07:55:37 +00:00
Laurent Montel
4f5267e8f8 Clean up
Use cmake macro
Remove not necessary files

svn path=/trunk/KDE/kdebase/workspace/; revision=578784
2006-08-30 08:33:11 +00:00
Laurent Montel
9310382fd5 Clean up
svn path=/trunk/KDE/kdebase/workspace/; revision=566946
2006-07-27 16:21:45 +00:00
Dirk Mueller
e12b8f755a merge bleeding edge. bleeding edge is now again dead
svn path=/trunk/KDE/kdebase/workspace/; revision=558082

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
2006-07-04 17:09:53 +00:00
Alexander Neundorf
a9fc0d54c7 kde4_header and kde4_footer() are gone now
svn path=/trunk/KDE/kdebase/workspace/; revision=540215

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
2006-05-12 18:12:37 +00:00
Alexander Neundorf
e4e2266d9c -add FONTCONFIG_INCLUDE_DIR where required
-cleanup the toplevel CMakeLists.txt a bit
-remove include_directories( CMAKE_CURRENT_SOURCE_DIR CMAKE_CURRENT_BINARY_DIR)
in the subdirs, since this is done now automatically by cmake (the CMAKE_INCLUDE_CURRENT_DIR option
-include_directories(KDE4_INCLUDES) in the toplevel CMakeLists.txt, so it
doesn't have to be done in every subdir

Alex


svn path=/trunk/KDE/kdebase/workspace/; revision=539914

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
2006-05-12 00:08:30 +00:00
Laurent Montel
7f7ce52d78 #include <q...h> -> #include <Q...>
svn path=/trunk/KDE/kdebase/workspace/; revision=539617
2006-05-11 08:04:23 +00:00
Frank Osterfeld
86d79b7414 replace LIB_INSTALL_DIR/kde4 with PLUGIN_INSTALL_DIR
svn path=/trunk/KDE/kdebase/workspace/; revision=531059
2006-04-18 14:21:54 +00:00
Hamish Rodda
77bc9cd63d Merging in from bleeding edge kdebase branch
- i18n ported
- KAccel removed
- Some fixes for OS X

svn path=/trunk/KDE/kdebase/workspace/; revision=528190
2006-04-10 11:57:13 +00:00
Alexander Neundorf
d3fe666661 -use KDE4_INCLUDES instead of KDE4_INCLUDE_DIR and QT_INCLUDES
Alex

svn path=/trunk/KDE/kdebase/workspace/; revision=522728

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
2006-03-26 14:52:52 +00:00
Laurent Montel
f96f1e4493 Fix cmake variable
svn path=/trunk/KDE/kdebase/workspace/; revision=522126
2006-03-24 14:59:45 +00:00
David Faure
090f6dcbfa Use set(CMAKE_INCLUDE_CURRENT_DIR ON) in the toplevel CMakeLists.txt, and we don't need to include
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} in each and every file anymore [only when subdirs might depend on that].

Also ran a script which makes sure that ${KDE4_INCLUDE_DIR} and ${QT_INCLUDES} are added -last-,
so that installed headers are not preferred over (possibly more uptodate) local headers.

svn path=/trunk/KDE/kdebase/workspace/; revision=521887

The following changes were in SVN, but were removed from git:

M	wallpapers/CMakeLists.txt
2006-03-23 19:24:10 +00:00
Laurent Montel
2d72d205be Fix typo
svn path=/trunk/KDE/kdebase/workspace/; revision=521451
2006-03-22 16:06:38 +00:00
Laurent Montel
65d7d827a0 Compile++
svn path=/trunk/KDE/kdebase/workspace/; revision=514732
2006-03-01 09:00:52 +00:00
Laurent Montel
03725a7d66 Add module to compile kdebase with kdelibs-cmake.
BE CARREFULL: Don't try to compile it for the moment (in progress)
Don't use kdelibs trunk for compile it (there is not again test to disable
compile when we compile with kdelibs trunk)
For the moment there was a lot of missing test etc.
I commit it just to allow to lose my changes if there is a pb on my HD.
I will sync cmake from kdelibs trunk to kdelibs-snapshot.
I hope to fix compile today or tomorrow.
CCMAIL: neundorf@kde.org

For the futur we must sync kdelibs/cmake/* to kdelibs-snapshot 
to compile all the time with kdelibs-snapshot

svn path=/trunk/KDE/kdebase/workspace/; revision=514380

The following changes were in SVN, but were removed from git:

A	wallpapers/CMakeLists.txt
2006-02-28 08:01:15 +00:00
Laurent Montel
b0a95318bc readBoolEntry->readEntry
svn path=/trunk/KDE/kdebase/workspace/; revision=493850
2006-01-03 14:01:15 +00:00
Stephan Kulow
7a441e1b7a the easy cases
svn path=/trunk/KDE/kdebase/workspace/; revision=466852
2005-10-03 15:13:54 +00:00
Laurent Montel
fef1c0b279 Byebye qvhbox
svn path=/trunk/KDE/kdebase/workspace/; revision=461727
2005-09-18 14:52:14 +00:00
Stephan Kulow
b464518b3c svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057
svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase
          .

I couldn't resolve one kicker conflict that results from different
development directions, so I rely on Aaron to sort it out - the file
is commited with conflicts

svn path=/trunk/KDE/kdebase/kwin/; revision=439627
2005-07-28 14:59:42 +00:00
Andrew Coles
bcbd5ab29c CVS_SILENT
Corrected typo.

svn path=/trunk/kdebase/kwin/; revision=379395
2005-01-17 12:54:08 +00:00
Sandro Giessl
da873a6d88 (corrected) patch by abraendle@gmx.de: "Quartz extra slim" option
CCBUG: 74967

svn path=/trunk/kdebase/kwin/; revision=378488
2005-01-14 17:56:02 +00:00
Dirk Mueller
8e31c22156 grrrrr...
svn path=/trunk/kdebase/kwin/; revision=376625
2005-01-08 22:25:07 +00:00
Dirk Mueller
1f509ffe24 fix export's
svn path=/trunk/kdebase/kwin/; revision=375962
2005-01-06 22:37:53 +00:00
Andrew Coles
d76ee99c2e CVS_SILENT
Corrected typos.

svn path=/trunk/kdebase/kwin/; revision=348126
2004-09-21 11:12:01 +00:00
Nicolas Goutte
7aba5a0721 Unify the translation of KWin's clients
(The user visible strings inkdebase/kwin/clients are extracted to
kwin_client.pot)
CCMAIL:kde-i18n-doc@kde.org

svn path=/trunk/kdebase/kwin/; revision=347824
2004-09-20 11:20:12 +00:00
Frans Englich
4b522c51cb Remove all CVS Id tags from kdebase, if I haven't missed one.
Of course, this will multifold break compile as well as a dozen of people
will now object that they actually wanted the Id tags.

svn path=/trunk/kdebase/ksysguard/; revision=290873
2004-02-24 11:30:21 +00:00
Aaron J. Seigo
ad483c520d dude up the config pages of these puppies. now that they appear on the
first tab of the kcm it became wildly obvious how much TLC they needed.

svn path=/trunk/kdebase/kwin/; revision=234652
2003-06-30 08:16:28 +00:00
Karol Szwed
ec918cec3b suppress warnings
svn path=/trunk/kdebase/kwin/; revision=174085
2002-08-27 15:31:58 +00:00
Stephan Kulow
e3e09f533d use kwin_ instead of libkwin
svn path=/trunk/kdebase/kwin/; revision=137446
2002-02-19 16:56:16 +00:00
Meni Livne
2c366e2d8e Adding insertCalatogue() calls enabling to show translated messages.
svn path=/trunk/kdebase/kwin/; revision=106169
2001-07-15 12:14:54 +00:00
Lukáš Tinkl
1540b2bf62 missing messages targets, adjusted naming for gallium's ease
svn path=/trunk/kdebase/kwin/; revision=105753
2001-07-12 11:56:22 +00:00
Karol Szwed
096025d7ed Renaming "foo Decoration Settings" to "Decoration Settings" to remove
redundancy in the config modules.

svn path=/trunk/kdebase/kwin/; revision=101301
2001-06-10 11:05:15 +00:00
Karol Szwed
ea93dcc2a4 - Follows stickyChange(bool) now - I should be shot for basing quartz on win2k
- Uses its own config file "kwinquartzrc" not to clutter kwinrc
- Fixed an unpainted area problem when windows are shaded

svn path=/trunk/kdebase/kwin/; revision=100337
2001-06-04 09:51:23 +00:00
Karol Szwed
2ade4cc7ec Small code cleanups and window border color config option added.
svn path=/trunk/kdebase/kwin/; revision=98802
2001-05-26 02:34:47 +00:00