- 15 May, 2013 - 1 commit
-
-
Friedemann Kleint authored
No longer include <qedit.h> in directshow-plugin, which no longer ships in newer SDKs. Ensure it only provides the camera service if the WMF-plugin is built by using a different .json-file. Adapt qcamerabackend-test to use widgets. Task-number: QTBUG-28047 Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90 Reviewed-by:
Yoann Lopes <yoann.lopes@digia.com>
-
- 10 Jan, 2013 - 1 commit
-
-
Sergio Ahumada authored
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b Reviewed-by:
Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@digia.com>
-
- 24 Sep, 2012 - 1 commit
-
-
Iikka Eklund authored
Change copyrights and license headers from Nokia to Digia Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709 Reviewed-by:
Janne Anttila <janne.anttila@digia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by:
Lars Knoll <lars.knoll@digia.com>
-
- 30 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6 Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com>
-
- 23 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
Replace Nokia contact email address with Qt Project website. Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com>
-
- 12 Jan, 2012 - 1 commit
-
-
Jason McDonald authored
Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by:
Rohan McGovern <rohan.mcgovern@nokia.com>
-
- 26 Sep, 2011 - 2 commits
-
-
Gareth Stockwell authored
In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is present, but dxtrans.h (which is #included by qedit.h) is missing. The standard workaround for this issue is already used by plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds the same workaround to the config test. Reviewed-by: Michael Goddard Reviewed-by: Ling Hu (cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1) Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d Reviewed-on: http://codereview.qt-project.org/5498 Reviewed-by:
Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by:
Michael Goddard <michael.goddard@nokia.com>
-
Ling Hu authored
directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0), so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow mediaplayer will also be replaced by wmf backend. Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b Reviewed-by:Michael Goddard (cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2) Reviewed-on: http://codereview.qt-project.org/5494 Reviewed-by:
Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by:
Michael Goddard <michael.goddard@nokia.com>
-
- 08 Jul, 2011 - 1 commit
-
-
Jyri Tahtela authored
Replace old license header with correct one. Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308 Reviewed-on: http://codereview.qt.nokia.com/1318 Reviewed-by:
Jyri Tahtela <jyri.tahtela@nokia.com>
-
- 29 Jun, 2011 - 1 commit
-
-
Michael Goddard authored
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2
-