Commit graph

127 commits

Author SHA1 Message Date
Allen Winter
5c93175949 remove kde4_automoc()
svn path=/trunk/KDE/kdebase/workspace/; revision=685984
2007-07-10 09:14:12 +00:00
Dirk Mueller
1e3214ed73 include cleanup to separate workspace
svn path=/trunk/KDE/kdebase/workspace/; revision=678951
2007-06-22 16:32:06 +00:00
Laurent Montel
f32b3e8d92 Remove not necessary "class classname;"
svn path=/trunk/KDE/kdebase/workspace/; revision=671233
2007-06-04 08:24:29 +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
30a119982a Merging from old trunk:
r578784 | mlaurent | 2006-08-30 10:33:11 +0200 (Wed, 30 Aug 2006) | 4 lines

Clean up
Use cmake macro
Remove not necessary files


svn path=/trunk/KDE/kdebase/workspace/; revision=659286
2007-04-29 21:52:25 +00:00
Luboš Luňák
73ce957bad Merging from old trunk:
r565833 | winterz | 2006-07-24 18:02:07 +0200 (Mon, 24 Jul 2006) | 2 lines

use library variables, where possible.


svn path=/trunk/KDE/kdebase/workspace/; revision=659261
2007-04-29 20:55:58 +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
2178c6dc31 Include fix
svn path=/trunk/KDE/kdebase/workspace/; revision=656565
2007-04-21 18:28:47 +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
Dirk Mueller
561fdef0ff include cleanup
svn path=/trunk/KDE/kdebase/workspace/; revision=652987
2007-04-12 13:02:58 +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
Stephan Kulow
ce11a2cd80 compile some more
svn path=/trunk/KDE/kdebase/workspace/; revision=635518
2007-02-20 08:18:28 +00:00
Stephan Kulow
ab1fe691d8 merged kconfiggroup_port branch
svn path=/trunk/KDE/kdebase/workspace/; revision=635490
2007-02-20 07:00:30 +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
Matthias Kretz
3003c4ecf8 merge the kinstance-redesign branch back to trunk.
svn path=/trunk/KDE/kdebase/workspace/; revision=628276
2007-01-29 17:14:20 +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
a654e519e1 Clean up
Remove not necessary files

svn path=/trunk/KDE/kdebase/workspace/; revision=598354
2006-10-23 11:35:02 +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
Allen Winter
6e204b3cf7 use library variables, where possible.
svn path=/trunk/KDE/kdebase/workspace/; revision=565833
2006-07-24 16:02:07 +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
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
Laurent Montel
366d1ee7cf Adapt to new kdelibs
svn path=/trunk/KDE/kdebase/workspace/; revision=538512
2006-05-08 08:28:37 +00:00
Laurent Montel
9c5a5fd6ea KPixmap was removed
svn path=/trunk/KDE/kdebase/workspace/; revision=538507
2006-05-08 08:14:01 +00:00
Stephan Kulow
dee1917849 revert broken commit
svn path=/trunk/KDE/kdebase/workspace/; revision=536543
2006-05-02 12:40:25 +00:00
Bernhard Rosenkraenzer
1fd35c1cf9 Compile fixes (KPixmap)
svn path=/trunk/KDE/kdebase/workspace/; revision=536502
2006-05-02 10:35:34 +00:00
Thorsten Roeder
5f4822c3c6 fix my stupid commit from yesterday.
thx.

CCMAIL: Woebbeking@onlinehome.de

svn path=/trunk/KDE/kdebase/workspace/; revision=535315
2006-04-29 09:21:48 +00:00
Thorsten Roeder
86d995aec4 avoid unnecessary conversion: QPixmap->QImage->QPixmap
svn path=/trunk/KDE/kdebase/workspace/; revision=535225
2006-04-28 21:29:59 +00:00
Stephan Kulow
072a101a10 removed quite some deprecated functions around pixmaps
(crossing fingers I didn't overlook some use of ::resize that
need the old pixmap data copied)

svn path=/trunk/KDE/kdebase/workspace/; revision=534212
2006-04-26 16:05:58 +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
Tobias Koenig
848bc14335 deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=529106
2006-04-12 15:13:31 +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
Luboš Luňák
443eb30ac8 switch fall-through fixes
svn path=/trunk/KDE/kdebase/workspace/; revision=527754
2006-04-09 09:43:31 +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
Sandro Giessl
fdb1b61473 Make kwin decorations API free of Qt3 support members
svn path=/trunk/KDE/kdebase/workspace/; revision=515804
2006-03-04 22:27:27 +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
f327b7f032 Deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=512331
2006-02-22 09:52:11 +00:00
Laurent Montel
b0a95318bc readBoolEntry->readEntry
svn path=/trunk/KDE/kdebase/workspace/; revision=493850
2006-01-03 14:01:15 +00:00