Commit graph

150 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
Fredrik Höglund
30ac8b6f99 Fix some Qt4 porting issues.
svn path=/trunk/KDE/kdebase/workspace/; revision=713496
2007-09-17 17:02:24 +00:00
Script Kiddy
b61130d037 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=711906

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

M	wallpapers/Chicken-Songs-2.jpg.desktop
M	wallpapers/here-gear.svgz.desktop
M	wallpapers/triplegears.jpg.desktop
2007-09-13 05:55:01 +00:00
Script Kiddy
11a29ecf38 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=710974
2007-09-11 06:23:45 +00:00
Script Kiddy
d9d648e579 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=710142

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

M	wallpapers/kde_box.png.desktop
M	wallpapers/konqui.svgz.desktop
2007-09-09 06:15:09 +00:00
Pino Toscano
44bab7a4eb set the autoFillBackground for the preview widget, so it's painted correctly clearing the garbage below
svn path=/trunk/KDE/kdebase/workspace/; revision=707412
2007-09-01 20:04:10 +00:00
Arto Hytönen
261456c8f7 a lot of i18n tags and other small krazy issues fixed, nothing major
svn path=/trunk/KDE/kdebase/workspace/; revision=702784
2007-08-21 07:02:04 +00:00
Script Kiddy
ac71f71d10 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=701736

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/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/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-08-19 06:11:40 +00:00
Allen Winter
5c93175949 remove kde4_automoc()
svn path=/trunk/KDE/kdebase/workspace/; revision=685984
2007-07-10 09:14:12 +00:00
Script Kiddy
4497741460 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=681732

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/andes-venezolanos.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/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-06-30 04:34:16 +00:00
Dirk Mueller
e625a97905 include cleanups
svn path=/trunk/KDE/kdebase/workspace/; revision=680057
2007-06-25 11:03:18 +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
Pino Toscano
38267e8ac6 less qt3support
svn path=/trunk/KDE/kdebase/workspace/; revision=672194
2007-06-06 10:37:37 +00:00
Script Kiddy
86c92d7985 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=669344

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/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/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/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/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-05-29 05:15:16 +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
b08128530c Merging from old trunk:
r652293 | mlaurent | 2007-04-10 18:31:06 +0200 (Tue, 10 Apr 2007) | 2 lines

Qt3support--


svn path=/trunk/KDE/kdebase/workspace/; revision=659577
2007-04-30 12:38:05 +00:00
Script Kiddy
2f376bbf89 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=659370
2007-04-30 05:06:54 +00:00
Luboš Luňák
bcf8544a27 Merging from old trunk:
r601570 | mlaurent | 2006-11-03 17:58:18 +0100 (Fri, 03 Nov 2006) | 2 lines

Port to uic4


svn path=/trunk/KDE/kdebase/workspace/; revision=659299
2007-04-29 22:31:09 +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
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
Script Kiddy
d45212d489 SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=652858

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/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/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
2007-04-12 05:10:21 +00:00
Laurent Montel
f8004bf458 Qt3support--
svn path=/trunk/KDE/kdebase/workspace/; revision=652293
2007-04-10 16:31:06 +00:00
Script Kiddy
4793790b1b SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=650658

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/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/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/lineart.svgz.desktop
M	wallpapers/moon.svgz.desktop
M	wallpapers/seaofconero.jpg.desktop
M	wallpapers/soft-green.jpg.desktop
M	wallpapers/sunshine-after-the-rain.jpg.desktop
M	wallpapers/triplegears.jpg.desktop
2007-04-05 04:44:04 +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
Script Kiddy
3ae271ef3e SVN_SILENT made messages (.desktop file)
svn path=/trunk/KDE/kdebase/workspace/; revision=639986

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/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/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
2007-03-06 13:53:59 +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
c0e49fc3ed Port to uic4
svn path=/trunk/KDE/kdebase/workspace/; revision=601570
2006-11-03 16:58:18 +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
Stephan Kulow
c1d76aa70d forwardport dirk's 482591
svn path=/trunk/KDE/kdebase/workspace/; revision=535697
2006-04-30 08:34:55 +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
Stephan Kulow
5c127f3fe9 deco is assigned NULL (CID 1247)
svn path=/trunk/KDE/kdebase/workspace/; revision=532152
2006-04-21 11:43:32 +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
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