2015-01-27 13:02:48 +00:00
|
|
|
diff -urN a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp
|
2015-03-01 23:03:31 +00:00
|
|
|
--- a/libkwineffects/kwinglplatform.cpp 2015-02-21 13:21:17.000000000 -0700
|
|
|
|
|
+++ b/libkwineffects/kwinglplatform.cpp 2015-03-01 16:01:13.843985675 -0700
|
2015-01-27 13:02:48 +00:00
|
|
|
@@ -25,6 +25,8 @@
|
2014-10-19 18:31:53 +00:00
|
|
|
#include <QStringList>
|
|
|
|
|
#include <QDebug>
|
|
|
|
|
|
|
|
|
|
+#include <X11/Xlib.h>
|
|
|
|
|
+
|
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
|
|
|
|
|
|
#include <iostream>
|
2015-01-27 13:02:48 +00:00
|
|
|
diff -urN a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp
|
2015-03-01 23:03:31 +00:00
|
|
|
--- a/libkwineffects/kwingltexture.cpp 2015-02-21 13:21:17.000000000 -0700
|
|
|
|
|
+++ b/libkwineffects/kwingltexture.cpp 2015-03-01 16:01:13.843985675 -0700
|
|
|
|
|
@@ -320,7 +320,7 @@
|
2014-10-19 18:31:53 +00:00
|
|
|
bool GLTexture::isNull() const
|
|
|
|
|
{
|
|
|
|
|
Q_D(const GLTexture);
|
|
|
|
|
- return None == d->m_texture;
|
|
|
|
|
+ return 0 == d->m_texture;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QSize GLTexture::size() const
|
