diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-25 21:51:05 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-25 21:51:05 +0000 |
| commit | 56ed03b7341e1cf22ac5e43030a8d3c6a7373145 (patch) | |
| tree | 17d885ce83bf48b401d96792ad2694f86bddef2e /kdecore | |
| parent | 3243d91d7fecb219e3e2fa90d4dfcc2ce957effe (diff) | |
| download | tdelibs-56ed03b7341e1cf22ac5e43030a8d3c6a7373145.tar.gz tdelibs-56ed03b7341e1cf22ac5e43030a8d3c6a7373145.zip | |
* Fixed FTBFS on Slackware
* Bumped version to 3.5.12 for eventual next release
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1168027 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/kdeversion.h | 4 | ||||
| -rw-r--r-- | kdecore/kipc.cpp | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/kdecore/kdeversion.h b/kdecore/kdeversion.h index 3e5b1b7a1..6ef9cb9f4 100644 --- a/kdecore/kdeversion.h +++ b/kdecore/kdeversion.h @@ -22,10 +22,10 @@ #include "kdelibs_export.h" -#define KDE_VERSION_STRING "3.5.11 [Trinity]" +#define KDE_VERSION_STRING "3.5.12 [Trinity]" #define KDE_VERSION_MAJOR 3 #define KDE_VERSION_MINOR 5 -#define KDE_VERSION_RELEASE 11 +#define KDE_VERSION_RELEASE 12 #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define KDE_VERSION \ diff --git a/kdecore/kipc.cpp b/kdecore/kipc.cpp index 3d21be6d1..8c568ba1b 100644 --- a/kdecore/kipc.cpp +++ b/kdecore/kipc.cpp @@ -27,12 +27,13 @@ */ #include "config.h" +#include <tqevent.h> #include <tqwindowdefs.h> #if defined Q_WS_X11 -#include <X11/X.h> -#include <X11/Xlib.h> -#include <kxerrorhandler.h> +#include <X11/X.h> +#include <X11/Xlib.h> +#include <kxerrorhandler.h> #endif #include <kipc.h> |