diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2015-04-14 15:13:30 +0200 |
|---|---|---|
| committer | Michal Kubecek <mkubecek@suse.cz> | 2015-04-15 10:54:47 +0200 |
| commit | 56db51035a7a4c8a2b2593a0911975970022f676 (patch) | |
| tree | ec4af30dc5521cc8b49a6f34435a3c1c4059e95e /src | |
| parent | 66ee9bc240956cc634502f41ffc9b2ba889cee13 (diff) | |
| download | twinkle-56db51035a7a4c8a2b2593a0911975970022f676.tar twinkle-56db51035a7a4c8a2b2593a0911975970022f676.tar.gz twinkle-56db51035a7a4c8a2b2593a0911975970022f676.tar.lz twinkle-56db51035a7a4c8a2b2593a0911975970022f676.tar.xz twinkle-56db51035a7a4c8a2b2593a0911975970022f676.zip | |
Qt4 port step 10: minor X11 related fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/freedesksystray.cpp | 5 | ||||
| -rw-r--r-- | src/gui/twinkle.pro | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/freedesksystray.cpp b/src/gui/freedesksystray.cpp index 0096a73..6812cbe 100644 --- a/src/gui/freedesksystray.cpp +++ b/src/gui/freedesksystray.cpp @@ -28,6 +28,8 @@ #include <QMouseEvent> #include <Q3PopupMenu> +#include <QtGui/QX11Info> + FreeDeskSysTray::FreeDeskSysTray ( QWidget *pParent , const char *pszName ) : QLabel(pParent, pszName, Qt::WMouseNoMask | Qt::WRepaintNoErase | Qt::WType_TopLevel | Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop) @@ -73,8 +75,7 @@ void FreeDeskSysTray::dock () XSync(dpy, false); Atom trayAtom; - // KDE 3 - WId forWin = mainWindow ? mainWindow->topLevelWidget()->winId() : qt_xrootwin(); + WId forWin = mainWindow ? mainWindow->topLevelWidget()->winId() : QX11Info::appRootWindow(); trayAtom = XInternAtom(dpy, "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", false); XChangeProperty(dpy, trayWin, trayAtom, XA_WINDOW, 32, PropModeReplace, (unsigned char *) &forWin, 1); diff --git a/src/gui/twinkle.pro b/src/gui/twinkle.pro index cc175e7..f943a5b 100644 --- a/src/gui/twinkle.pro +++ b/src/gui/twinkle.pro @@ -3,7 +3,7 @@ LANGUAGE = C++ CONFIG += qt warn_on release thread -LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline +LIBS += ../libtwinkle.a ../parser/libsipparser.a ../sdp/libsdpparser.a ../sockets/libsocket.a ../threads/libthread.a ../audio/libaudio.a ../audits/libaudits.a ../stun/libstun.a ../mwi/libmwi.a ../im/libim.a ../patterns/libpatterns.a ../presence/libpresence.a ../utils/libutils.a -lsndfile -lmagic -lncurses -lreadline -lX11 DEFINES += QT_NO_STL |