Commit graph

115 commits

Author SHA1 Message Date
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
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
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
Stephan Kulow
abeff9d0f6 some colorgroup porting
svn path=/trunk/KDE/kdebase/workspace/; revision=535723
2006-04-30 09:16:13 +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
Thorsten Roeder
e648ada92f deprecated--
QPixmap::convertFromImage()

svn path=/trunk/KDE/kdebase/kmenuedit/; revision=532766
2006-04-22 18:12:21 +00:00
Thorsten Roeder
ed725e1a15 deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=532321
2006-04-21 17:10:24 +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
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
1e8cf8aa59 deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=512447
2006-02-22 15:08:04 +00:00
Laurent Montel
f327b7f032 Deprecated--
svn path=/trunk/KDE/kdebase/workspace/; revision=512331
2006-02-22 09:52:11 +00:00
Script Kiddy
30cb1f9f43 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=495177

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

M	wallpapers/All-Good-People-1.jpg.desktop
M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/KDE34.png.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Totally-New-Product-1.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/alta-badia.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/aurora.svgz.desktop
M	wallpapers/blue-bend.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/floating-leaves.jpg.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/konqui.svgz.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/stelvio.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2006-01-07 12:16:49 +00:00
Laurent Montel
b0a95318bc readBoolEntry->readEntry
svn path=/trunk/KDE/kdebase/workspace/; revision=493850
2006-01-03 14:01:15 +00:00
Laurent Montel
bb61c66b88 qt3support--
svn path=/trunk/KDE/kdebase/workspace/; revision=479406
2005-11-10 11:50:13 +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
Matt Broadstone
5da7024486 rid ourselves of the Q3Buttons
svn path=/trunk/KDE/kdebase/kwin/; revision=449967
2005-08-17 09:15:59 +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
Script Kiddy
89d0f65e6f SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/klipper/; revision=438476

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

M	wallpapers/KDE34.png.desktop
M	wallpapers/Marble01.jpg.desktop
M	wallpapers/Paper01.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/moon.svgz.desktop
2005-07-25 04:26:26 +00:00
Script Kiddy
ec2e3683d3 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/klipper/; revision=438053

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

M	wallpapers/KDE34.png.desktop
M	wallpapers/Marble01.jpg.desktop
M	wallpapers/Paper01.jpg.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/moon.svgz.desktop
2005-07-24 04:27:49 +00:00
Script Kiddy
7abbaf3bc8 CVS_SILENT made messages (.desktop file)
svn path=/trunk/kdebase/kcontrol/; revision=405178

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

M	wallpapers/Blkmarble.jpg.desktop
M	wallpapers/No-Ones-Laughing-3.jpg.desktop
M	wallpapers/Planning-And-Probing-1.jpg.desktop
M	wallpapers/Time-For-Lunch-2.jpg.desktop
M	wallpapers/Won-Ton-Soup-3.jpg.desktop
M	wallpapers/andes-venezolanos.svgz.desktop
M	wallpapers/celtic.svgz.desktop
M	wallpapers/default_blue.jpg.desktop
M	wallpapers/default_gears.jpg.desktop
M	wallpapers/fulmine.jpg.desktop
M	wallpapers/gear-flowers.svgz.desktop
M	wallpapers/globe.svgz.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/kde_box.png.desktop
M	wallpapers/lineart.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2005-04-12 22:04:49 +00:00
Sandro Giessl
99c7f10187 fall back to KCommonDecoration::layoutMetric
svn path=/trunk/kdebase/kwin/; revision=400746
2005-03-26 13:18:32 +00:00
Sandro Giessl
b356373b1e remove unnecessary includes
svn path=/trunk/kdebase/kwin/; revision=400264
2005-03-24 16:34:08 +00:00
Sandro Giessl
e70e385bf9 add copyright...
svn path=/trunk/kdebase/kwin/; revision=399851
2005-03-22 23:06:32 +00:00
Sandro Giessl
77567c923c port quartz to KCommonDecoration
svn path=/trunk/kdebase/kwin/; revision=399465
2005-03-21 15:53:41 +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