Commit graph

20 commits

Author SHA1 Message Date
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
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
a48328e5bc QString::null->QString()
.clear()
etc

svn path=/trunk/KDE/kdebase/workspace/; revision=493536
2006-01-02 16:27:55 +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
Stephan Binner
5cdfe8100a Replaced several Yes/No dialog buttons
svn path=/trunk/KDE/kdebase/kcontrol/; revision=432857
2005-07-08 19:31:49 +00:00
Andrew Coles
75db450e8b Finished correcting typos in kdebase, phew!
Andrew

svn path=/trunk/kdebase/ksysguard/; revision=312639
2004-05-19 14:32:18 +00:00
Luboš Luňák
b3547b4059 Access the static method directly (not that it wouldn't work via NULL pointer).
svn path=/trunk/kdebase/kwin/; revision=291219
2004-02-25 10:00:37 +00:00
Luboš Luňák
9ace7a3634 Fix i18n.
CCMAIL: 72239-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=290910
2004-02-24 13:32:39 +00:00
Luboš Luňák
7d10a9a2c9 Let's use SIGKILL instead of just SIGTERM. The user has to explicitly
confirm killing the app anyway, and some stuck apps might not exit on SIGTERM.

svn path=/trunk/kdebase/kwin/; revision=261231
2003-10-23 09:29:00 +00:00
Malcolm Hunter
b3144663fd CVS_SILENT Typographical corrections and changes
svn path=/trunk/kdebase/kwin/; revision=261100
2003-10-22 16:57:59 +00:00
Luboš Luňák
52cb814d32 Make the killer dialog transient for the nonresponding window.
svn path=/trunk/kdebase/kwin/; revision=260985
2003-10-22 08:18:04 +00:00
Luboš Luňák
a77da4851e Use KApplication::updateUserTimestamp() instead of trying to set it
directly on the dialog.

svn path=/trunk/kdebase/kwin/; revision=258581
2003-10-13 16:18:24 +00:00
Luboš Luňák
c8c1c6c764 Since the messages are in kwin's .po file, I guess this is needed.
svn path=/trunk/kdebase/kwin/; revision=254815
2003-09-29 11:21:28 +00:00
Luboš Luňák
0ef8354c30 Merging back the process killing helper from kwin_iii to HEAD.
svn path=/trunk/kdebase/kwin/; revision=251615
2003-09-16 19:32:34 +00:00