Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | compile fix with namespaces | hjk | 2009-08-26 | 13 | -1/+48 |
| | | | | 13 pairs missing... | ||||
* | Merge commit 'origin/master' into 4.6 | Jason Barron | 2009-08-25 | 2 | -4/+4 |
|\ | |||||
| * | Removed some 'illegal empty declaration' warnings from Symbian build | Janne Anttila | 2009-08-24 | 2 | -4/+4 |
| | | | | | | | | Reviewed-by: TrustMe | ||||
* | | Integrate QAbstractVideoSurface API. | Andrew den Exter | 2009-08-24 | 16 | -6/+3064 |
|/ | | | | | | | | | | This introduces a QAbstractVideoSurface interface for implementing arbitrary video outputs, and a QVideoFrame type. Also included is the QVideoSurfaceFormat class which is used to configure the input to a video surface, and the QAbstractVideoBuffer class which allows QVideoFrames to be constructed from non-native frame types. Reviewed-by: Dmytro Poplavskiy | ||||
* | Use LIBS_PRIVATE on Mac and X11. | Thiago Macieira | 2009-08-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen | ||||
* | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 39 | -39/+39 |
| | | | | Reviewed-by: Trust Me | ||||
* | multimedia: fix warnings on mingw | Thierry Bastian | 2009-08-06 | 4 | -4/+3 |
| | | | | | moved static CRITICAL_SECTIONs to cpp files. In header they would be declared more than once depending on what file includes those headers. | ||||
* | Merge AudioServices into mainline. | Justin McPherson | 2009-08-05 | 41 | -0/+10144 |