1 files changed, 30 insertions, 0 deletions
diff --git a/Tools/qt/jhbuild-qt-5.4.modules b/Tools/qt/jhbuild-qt-5.4.modules
index fc85f6ee0..194335129 100644
--- a/Tools/qt/jhbuild-qt-5.4.modules
+++ b/Tools/qt/jhbuild-qt-5.4.modules
@@ -6,8 +6,10 @@
   <metamodule id="qt">
     <dependencies>
       <dep package="qtbase"/>
+      <dep package="qtdeclarative"/>
       <dep package="qtlocation"/>
       <dep package="qtsensors"/>
+      <dep package="qtwebchannel"/>
     </dependencies>
   </metamodule>
 
@@ -64,6 +66,9 @@
       <patch file="qtbase-5.4-fontconfig-fix.patch" strip="1"/>
       <patch file="qtbase-5.4-no-sslv3.patch" strip="1"/>
       <patch file="qtbase-5.4-no-sslv2_3.patch" strip="1"/>
+      <patch file="qtbase-5.4-add-macros-for-enabling-disabling-warnings.patch" strip="1"/>
+      <patch file="qtbase-5.4-fix-Clang-warning-about-inconsistent-use-of-C-11-ove.patch" strip="1"/>
+      <patch file="qtbase-5.4-fix-gcc-Wsuggest-override-warning-on-Q_OBJECT.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="fontconfig"/>
@@ -74,6 +79,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="qtdeclarative"
+      autogen-template="%(prefix)s/bin/qmake %(srcdir)s"
+      makeinstallargs="install INSTALL_ROOT='$(DESTDIR)'"
+      supports-non-srcdir-builds="no">
+      <branch module="archive/qt/5.4/${version}/submodules/qtdeclarative-opensource-src-${version}.tar.xz" version="5.4.0"
+          repo="download.qt.io"
+          hash="sha256:e67c9275b0f6869a7c1e8023ad7c0a23fb19f8a8d2f350371e954ead0cfad7b6"/>
+      <dependencies>
+          <dep package="qtbase"/>
+      </dependencies>
+  </autotools>
+
   <autotools id="qtlocation"
       autogen-template="%(prefix)s/bin/qmake %(srcdir)s"
       makeinstallargs="install INSTALL_ROOT='$(DESTDIR)'"
@@ -97,4 +114,17 @@
           <dep package="qtbase"/>
       </dependencies>
   </autotools>
+
+  <autotools id="qtwebchannel"
+      autogen-template="%(prefix)s/bin/qmake %(srcdir)s"
+      makeinstallargs="install INSTALL_ROOT='$(DESTDIR)'"
+      supports-non-srcdir-builds="no">
+      <branch module="archive/qt/5.4/${version}/submodules/qtwebchannel-opensource-src-${version}.tar.xz" version="5.4.0"
+          repo="download.qt.io"
+          hash="sha256:24eb0125198270f8595babb6c0df74dd13e0ccc8c8a5e665151cf68c3306594c"/>
+      <dependencies>
+          <dep package="qtbase"/>
+          <dep package="qtdeclarative"/>
+      </dependencies>
+  </autotools>
 </moduleset>