Liang Qi
1925bb404e
Merge remote-tracking branch 'origin/5.4' into 5.5
...
Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
2015-04-15 09:26:14 +02:00
Yoann Lopes
0cd222c9b4
Fix audioengine example.
...
- Add missing audio files
- Fix 'Unable to assign double to QVector3D' warning
- Don't show decimal part of the volume
Task-number: QTBUG-41841
Task-number: QTBUG-44304
Change-Id: Ie24284242bbac0d10bd85841932c506d7634a514
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com >
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com >
2015-04-07 12:08:01 +00:00
Sergio Ahumada
36e90b6928
Fix BSD license headers
...
Change-Id: I639ed933b789393fa50630af133e51abe3d7fae3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com >
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com >
2015-02-17 13:32:36 +00:00
Antti Kokko
bbfccc7135
Update copyright headers
...
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.
Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com >
2015-02-12 10:27:47 +00:00
Sergio Ahumada
399500f87e
Update copyright year in Digia's license headers
...
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com >
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com >
2013-01-10 17:56:01 +01:00
Joerg Bornemann
6b4994c265
centralize and fixup example sources install targets
...
This follows suit with aeb036e in qtbase.
Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com >
Reviewed-by: hjk <qthjk@ovi.com >
2012-12-05 18:20:35 +01:00
