projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06eab79 9f484ea)
Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:02 +0000 (12:47 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:47:02 +0000 (12:47 +0200)
Conflicts:
src/plugins/plugins.pro

Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf

1  2 
src/plugins/plugins.pro patch | diff1 | diff2 | blob | history

diff --cc src/plugins/plugins.pro
index 4ef472d,8234e7e..ba8a388
--- 1/src/plugins/plugins.pro
--- 2/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@@ -53,6 -53,7 +53,11 @@@ mac:!simulator 
      }
  }
  
 +config_opensles {
 +    SUBDIRS += opensles
 +}
++
+ config_resourcepolicy {
+     SUBDIRS += resourcepolicy
+ }
+ 
Domain: UI Framework / Qt;