Commit graph

142 commits

Author SHA1 Message Date
Luboš Luňák
3617d1bf8a Merge r649608, r649403, r649230 and r648582 from trunk (porting).
svn path=/branches/work/kwin_composite/; revision=649948
2007-04-03 13:24:05 +00:00
Stephan Kulow
9df321c98d merge in /branches/work/coolos_libloader:
returning void* for functions is bad - so introduce
resolveFunction() and resolveSymbol() to make this separation
clear.

svn path=/trunk/KDE/kdebase/workspace/; revision=649230
2007-04-02 11:07:11 +00:00
Dirk Mueller
85677f205f pedantic--
svn path=/trunk/KDE/kdebase/workspace/; revision=644597
2007-03-20 14:21:56 +00:00
Tim Beaulen
04d80e9d05 Build
The error I got:
[ 43%] Building CXX object workspace/kwin/lib/CMakeFiles/kdecorations.dir/kcommondecoration.o
/home/kde4-devel/qt-copy/include/QtGui/../../src/gui/widgets/qabstractbutton.h: In member function 'void QAbstractButton::qt_check_for_QOBJECT_macro(const T&) const 
[with T = KCommonDecorationButton]':
/home/kde4-devel/qt-copy/include/QtCore/../../src/corelib/kernel/qobject.h:411:   instantiated from 'T qobject_cast(QObject*) [with T = KCommonDecorationButton*]'
/home/kde4-devel/kde/src/kdebase/workspace/kwin/lib/kcommondecoration.cpp:203:   instantiated from here
/home/kde4-devel/qt-copy/include/QtGui/../../src/gui/widgets/qabstractbutton.h:40: error: void value not ignored as it ought to be
make[2]: *** [workspace/kwin/lib/CMakeFiles/kdecorations.dir/kcommondecoration.o] Error 1
make[1]: *** [workspace/kwin/lib/CMakeFiles/kdecorations.dir/all] Error 2


svn path=/branches/work/kwin_composite/; revision=640708
2007-03-08 21:37:13 +00:00
Dirk Mueller
5cd482868b header cleanness++
svn path=/trunk/KDE/kdebase/workspace/; revision=637475
2007-02-26 15:46:23 +00:00
Dirk Mueller
28697de826 header cleanness++
svn path=/trunk/KDE/kdebase/workspace/; revision=637366
2007-02-26 07:44:18 +00:00
Dirk Mueller
d6dd2a2616 various kconfig portings
svn path=/trunk/KDE/kdebase/workspace/; revision=636679
2007-02-23 20:24:36 +00:00
Luboš Luňák
8af21ee5b3 merge r635823 from trunk
svn path=/branches/work/kwin_composite/; revision=636609
2007-02-23 14:38:01 +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
ab1fe691d8 merged kconfiggroup_port branch
svn path=/trunk/KDE/kdebase/workspace/; revision=635490
2007-02-20 07:00:30 +00:00
Dirk Mueller
b93c21f574 fix library versioning
svn path=/trunk/KDE/kdebase/workspace/; revision=635264
2007-02-19 16:56:53 +00:00
Luboš Luňák
36afaf2efc Merge r632199 from kwin_composite.
svn path=/trunk/KDE/kdebase/workspace/; revision=632843
2007-02-12 13:29:36 +00:00
Luboš Luňák
1397ebb5eb No double-buffering for decorations, the memory taken
by such backing pixmaps would be quite noticeable.


svn path=/branches/work/kwin_composite/; revision=632377
2007-02-10 21:50:43 +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
Luboš Luňák
00136f014f Configurable effects loading by Cedric Borgese.
svn path=/branches/work/kwin_composite/; revision=630276
2007-02-04 22:19:17 +00:00
Simon Hausmann
992f2ee6b9 Don't crash due to a missing Q_OBJECT macro
svn path=/trunk/KDE/kdebase/workspace/; revision=629104
2007-02-01 11:40:13 +00:00
Laurent Montel
8d01ae32ea This directory doesn't exist on my computer :)
svn path=/trunk/KDE/kdebase/workspace/; revision=628350
2007-01-29 20:55:50 +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
Luboš Luňák
f52407b829 Merge in compilation fixes from trunk.
svn path=/branches/work/kwin_composite/; revision=619536
2007-01-03 16:53:26 +00:00
Laurent Montel
32504fd22c Fix link
svn path=/trunk/KDE/kdebase/workspace/; revision=619141
2007-01-02 20:57:56 +00:00
Luboš Luňák
ae1a1b25f7 Match defaults.
BUG: 137889


svn path=/trunk/KDE/kdebase/workspace/; revision=608824
2006-11-28 14:42:48 +00:00
Laurent Montel
012be9b663 Fix compile with compilator!=gcc
svn path=/trunk/KDE/kdebase/workspace/; revision=604645
2006-11-13 15:31:59 +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
Luboš Luňák
31c7372e51 Fix two same argument names.
svn path=/trunk/KDE/kdebase/workspace/; revision=595998
2006-10-16 12:41:38 +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
2de50c0f20 Other clean
svn path=/trunk/KDE/kdebase/workspace/; revision=578787
2006-08-30 08:34:43 +00:00
Allen Winter
06496c6d21 install_files() -> install(FILES..)
also use variables in a few more places

svn path=/trunk/KDE/kdebase/workspace/; revision=565957
2006-07-24 22:17:55 +00:00
Luboš Luňák
a23d4f820b These warnings were pretty annoying.
svn path=/branches/work/kwin_composite/; revision=558180
2006-07-04 20:23:29 +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
Jaison Lee
fd6ba30cb3 EBN spelling corrections.
svn path=/trunk/KDE/kdebase/workspace/; revision=552770
2006-06-19 01:43:22 +00:00
Thorsten Roeder
d68dafda6b fixed some EBN issues
svn path=/trunk/KDE/kdebase/workspace/; revision=546993
2006-05-31 16:23:36 +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
Riccardo Iaconelli
014ff479d9 Fixed some typos
svn path=/trunk/KDE/kdebase/workspace/; revision=538338
2006-05-07 15:22:08 +00:00
Alexander Neundorf
0804aa70dc -remove the kde4_create_doxygen_docs() command
Alex


svn path=/trunk/KDE/kdebase/workspace/; revision=536344
2006-05-01 21:20:18 +00:00
Stephan Kulow
85aa311b0b remove the messages targets already in separate scripts
svn path=/trunk/KDE/kdebase/workspace/; revision=536228
2006-05-01 16:48:29 +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
Szombathelyi György
3bf0fce883 Compilable without installed kdebase
svn path=/trunk/KDE/kdebase/workspace/; revision=524556
2006-03-30 16:50:15 +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
Laurent Montel
99f8ff81b5 Deprecated--
svn path=/trunk/KDE/kdebase/kmenuedit/; revision=516274
2006-03-06 14:30:06 +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
Allen Winter
b22c86f670 remove all @since doxygen tags from this module
svn path=/trunk/KDE/kdebase/workspace/; revision=515788
2006-03-04 21:09:32 +00:00
Sandro Giessl
c669e57515 replace support member
svn path=/trunk/KDE/kdebase/workspace/; revision=515774
2006-03-04 20:18:25 +00:00
Laurent Montel
d83850219c Compile++
svn path=/trunk/KDE/kdebase/workspace/; revision=514717
2006-03-01 07:42:47 +00:00