Merge branch 'stable' into dev dev_1378902914 dev_1378920809 dev_1378966022 91/65191/1
authorSergio Ahumada <sergio.ahumada@digia.com>
Wed, 11 Sep 2013 11:31:09 +0000 (13:31 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Wed, 11 Sep 2013 11:31:41 +0000 (13:31 +0200)
Conflicts:
qt.pro

Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82

1  2 
init-repository
qt.pro

diff --cc init-repository
Simple merge
diff --cc qt.pro
--- 1/qt.pro
--- 2/qt.pro
+++ b/qt.pro
@@@ -60,7 -59,9 +59,8 @@@ addModule(qtx11extras, qtbase
  addModule(qlalr, qtbase)
  addModule(qtsvg, qtbase)
  addModule(qtxmlpatterns, qtbase)
 -addModule(qtjsbackend, qtbase)
 -addModule(qtdeclarative, qtjsbackend, qtsvg qtxmlpatterns)
 +addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
+ addModule(qtwinextras, qtbase, qtdeclarative)
  addModule(qtquickcontrols, qtdeclarative)
  addModule(qtmultimedia, qtdeclarative)
  addModule(qtactiveqt, qtbase)