slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	src/plugins/plugins.pro

Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
This commit is contained in:
Frederik Gladhorn
2013-08-12 12:47:02 +02:00
parent 06eab796ba 9f484eae83
commit 74e4b59ec8
11 changed files with 390 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/resourcepolicy/resourcepolicy.pro
View File

@@ -3,5 +3,5 @@ SOURCES += main.cpp
CONFIG += link_pkgconfig
PKGCONFIG += \
libresourceqt1
libresourceqt5