Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 1 | -0/+6 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro | ||||
| * | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek conf | Jørgen Lind | 2010-06-01 | 1 | -0/+4 |
| | | | | | | | | Reviewed-by: paul | ||||
* | | Stub out QtOpenGL on Lighthouse & get it compiling | Tom Cooksey | 2010-03-31 | 1 | -4/+0 |
|/ | |||||
* | add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX | Oswald Buddenhagen | 2010-02-26 | 1 | -0/+1 |
| | | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO | ||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 1 | -0/+19 |