diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 10:15:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 10:15:34 (GMT) |
| commit | aac8c2678867ae86af846a2644e37b3d1436406a (patch) | |
| tree | 64a5eab52fbec59c7cdf04afe5d1e76a78ce5075 /mkspecs | |
| parent | 39e6aa3f4434ab31d3d862574aa505b3f946ee9b (diff) | |
| parent | b0390e68893dd04076434695be5e676b87bc067c (diff) | |
| download | Qt-aac8c2678867ae86af846a2644e37b3d1436406a.zip Qt-aac8c2678867ae86af846a2644e37b3d1436406a.tar.gz Qt-aac8c2678867ae86af846a2644e37b3d1436406a.tar.bz2 | |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits)
Lighthouse: License headers to new files in testlite
Make sure we blit the fbo on flush in QGLWindowSurface
Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice
Making clearer separation between responsibility of different classes
Make it possible to vertically mirror gl painting
Lighthouse:Wayland Moving some logic into files
Fix Wayland plugin to work with Wayland after some interfaces changed
Make QGLContext::fromPlatformGLContext show correct sharing
Remove Lighthouse specific code from QGLWindowSurface
Fix X11 clipboard bug.
Fix for uninitialized member in QWaylandCursor
wayland: use pkgconfig for libdrm in wayland.pro
wayland: remove non-public header from config.tests
wayland: fix SOURCES to point to wayland.cpp in config.tests
Wayland: request rbg and premultiplied argb visuals as needed
Wayland: clamp window resizes to screen size
Wayland: split GL code into separate files
Wayland: use correct viewport for swapBuffers and correct coords
Wayland: fix geometry of swapBuffers
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/mac/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/common/mac/qplatformdefs.h b/mkspecs/common/mac/qplatformdefs.h index 99d64ef..5d1f99a 100644 --- a/mkspecs/common/mac/qplatformdefs.h +++ b/mkspecs/common/mac/qplatformdefs.h @@ -75,7 +75,7 @@ #include <net/if.h> #endif -#include "../common/posix/qplatformdefs.h" +#include "../posix/qplatformdefs.h" #undef QT_OPEN_LARGEFILE #undef QT_SOCKLEN_T diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 5e1e8fd..ede9657 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -2,7 +2,7 @@ isEmpty(TEMPLATE):TEMPLATE=app CONFIG += qt warn_on console depend_includepath testcase # x11 is not defined by configure (the following line is copied from gui.pro) -!win32:!embedded:!mac:!symbian:CONFIG += x11 +!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11 qtAddLibrary(QtTest) |