Commit graph

33 commits

Author SHA1 Message Date
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
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
Thorsten Roeder
e000f78091 fixing some EBN issues
svn path=/trunk/KDE/kdebase/workspace/; revision=542916
2006-05-20 15:56:37 +00:00
Laurent Montel
5725624c8b #include <q...h> -> #include <Q...>
svn path=/trunk/KDE/kdebase/workspace/; revision=540496
2006-05-13 16:33:18 +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
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
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
Hamish Rodda
023fa86718 Port to new kdelibs snapshot. Most major changes are in konqueror due to
its reasonably heavy use of custom actions.

My kdelibs was a day old when i compiled, so if there is non-action
related porting still to do... it's probably still not done... will
check

svn path=/trunk/KDE/kdebase/workspace/; revision=521386
2006-03-22 13:32:49 +00:00
Sandro Giessl
54389b6abb Make it compile. It seems kwin3_cokoon performs better than kwin3_plastik. Though
it feels slower than anything in KWin 3.

svn path=/trunk/KDE/kdebase/workspace/; revision=515516
2006-03-04 00:37:11 +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
0fa10f318d Deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=506323
2006-02-06 14:47:18 +00:00
Script Kiddy
19e65c92dc Fix FSF address
(mainly s/Steet/Street/;s/Cambridge/Boston/ )

svn path=/trunk/KDE/kdebase/workspace/; revision=490222
2005-12-21 06:45:09 +00:00
Laurent Montel
1c3e66488b Adapt to new kde4 api
Remove some qt3support

svn path=/trunk/KDE/kdebase/workspace/; revision=478902
2005-11-08 10:20:07 +00:00
Dirk Mueller
e20f2bd6b2 SVN_SILENT: fix typo
svn path=/trunk/KDE/kdebase/kdm/; revision=467416
2005-10-05 08:44:32 +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
Dirk Mueller
da212229af SVN_SILENT update FSF address
svn path=/trunk/KDE/kdebase/kwin/; revision=433335
2005-07-10 13:44:16 +00:00
Sandro Giessl
0bcfea20c9 add decoration recreation test
svn path=/trunk/kdebase/kwin/; revision=396795
2005-03-11 21:08:27 +00:00
Sandro Giessl
721415e1fc do not show the preview label since this is not relevant and only slows down the test
svn path=/trunk/kdebase/kwin/; revision=396656
2005-03-11 14:31:45 +00:00
Sandro Giessl
f80d4f2160 add caption and resize tests.
svn path=/trunk/kdebase/kwin/; revision=396655
2005-03-11 14:28:19 +00:00
Sandro Giessl
b10f0059c7 Import a little tool which helps comparing the performance of decorations.
svn path=/trunk/kdebase/kwin/; revision=396399
2005-03-10 16:57:04 +00:00
Luboš Luňák
8bd7aa970a Latest xorg already has this.
svn path=/trunk/kdebase/kwin/; revision=353941
2004-10-12 14:40:58 +00:00
Luboš Luňák
bd4789e32b Looks like I got window gravities working correctly also for configure requests.
CCMAIL: 64981-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=255356
2003-10-01 12:10:22 +00:00
Luboš Luňák
1ffd659717 Merging back tools directory from kwin_iii to HEAD.
svn path=/trunk/kdebase/kwin/; revision=251613
2003-09-16 19:31:17 +00:00