From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mpeglib/lib/util/render/x11/initDisplay.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mpeglib/lib/util/render/x11/initDisplay.cpp') diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp index d0029eb6..2a62e721 100644 --- a/mpeglib/lib/util/render/x11/initDisplay.cpp +++ b/mpeglib/lib/util/render/x11/initDisplay.cpp @@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) { int depth; Visual *visual; XSetWindowAttributes xswa; - unsigned long mask; + unsigned long tqmask; unsigned int c_class; int screen; Display *dpy=xwindow->display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, mask, &xswa); + visual, tqmask, &xswa); */ } -- cgit v1.2.1