QtModules qt.pro mangling

By default Qt reads the module configuration from .gitmodules
but since our fork is just a single repo for all modules
we don't want .gitmodules around since it will start to try to
checkout a lot of submodules on the CI.

So instead we just rename it to .qtmodules

.qtmodules

@@ -0,0 +1,314 @@
+[submodule "qtbase"]
+	path = qtbase
+	url = ../qtbase.git
+	branch = 5.13.1
+	status = essential
+[submodule "qtsvg"]
+	depends = qtbase
+	path = qtsvg
+	url = ../qtsvg.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtdeclarative"]
+	depends = qtbase
+	recommends = qtsvg
+	path = qtdeclarative
+	url = ../qtdeclarative.git
+	branch = 5.13.1
+	status = essential
+[submodule "qtactiveqt"]
+	depends = qtbase
+	path = qtactiveqt
+	url = ../qtactiveqt.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtscript"]
+	depends = qtbase
+	recommends = qttools
+	path = qtscript
+	url = ../qtscript.git
+	branch = 5.13.1
+	status = deprecated
+[submodule "qtmultimedia"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtmultimedia
+	url = ../qtmultimedia.git
+	branch = 5.13.1
+	status = essential
+[submodule "qttools"]
+	depends = qtbase
+	recommends = qtdeclarative qtactiveqt
+	path = qttools
+	url = ../qttools.git
+	branch = 5.13.1
+	status = essential
+[submodule "qtxmlpatterns"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtxmlpatterns
+	url = ../qtxmlpatterns.git
+	branch = 5.13.1
+	status = deprecated
+[submodule "qttranslations"]
+	depends = qttools
+	path = qttranslations
+	url = ../qttranslations.git
+	branch = 5.13.1
+	status = essential
+	priority = 30
+[submodule "qtdoc"]
+	depends = qtdeclarative qttools
+	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
+	path = qtdoc
+	url = ../qtdoc.git
+	branch = 5.13.1
+	status = essential
+	priority = 40
+[submodule "qtrepotools"]
+	path = qtrepotools
+	url = ../qtrepotools.git
+	branch = master
+	status = essential
+	project = -
+[submodule "qtqa"]
+	depends = qtbase
+	path = qtqa
+	url = ../qtqa.git
+	branch = master
+	status = essential
+	priority = 50
+[submodule "qtlocation"]
+	depends = qtbase
+	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
+	path = qtlocation
+	url = ../qtlocation.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtsensors"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtsensors
+	url = ../qtsensors.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtsystems"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtsystems
+	url = ../qtsystems.git
+	branch = dev
+	status = ignore
+[submodule "qtfeedback"]
+	depends = qtdeclarative
+	recommends = qtmultimedia
+	path = qtfeedback
+	url = ../qtfeedback.git
+	branch = master
+	status = ignore
+[submodule "qtdocgallery"]
+	depends = qtdeclarative
+	path = qtdocgallery
+	url = ../qtdocgallery.git
+	branch = master
+	status = ignore
+[submodule "qtpim"]
+	depends = qtdeclarative
+	path = qtpim
+	url = ../qtpim.git
+	branch = dev
+	status = ignore
+[submodule "qtconnectivity"]
+	depends = qtbase
+	recommends = qtdeclarative qtandroidextras
+	path = qtconnectivity
+	url = ../qtconnectivity.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwayland"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtwayland
+	url = ../qtwayland.git
+	branch = 5.13.1
+	status = addon
+[submodule "qt3d"]
+	depends = qtbase
+	recommends = qtdeclarative qtimageformats qtgamepad
+	path = qt3d
+	url = ../qt3d.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtimageformats"]
+	depends = qtbase
+	path = qtimageformats
+	url = ../qtimageformats.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtgraphicaleffects"]
+	depends = qtdeclarative
+	path = qtgraphicaleffects
+	url = ../qtgraphicaleffects.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtquickcontrols"]
+	depends = qtdeclarative
+	recommends = qtgraphicaleffects
+	path = qtquickcontrols
+	url = ../qtquickcontrols.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtserialbus"]
+	depends = qtbase
+	recommends = qtserialport
+	path = qtserialbus
+	url = ../qtserialbus.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtserialport"]
+	depends = qtbase
+	path = qtserialport
+	url = ../qtserialport.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtx11extras"]
+	depends = qtbase
+	path = qtx11extras
+	url = ../qtx11extras.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtmacextras"]
+	depends = qtbase
+	path = qtmacextras
+	url = ../qtmacextras.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwinextras"]
+	depends = qtbase
+	recommends = qtdeclarative qtmultimedia
+	path = qtwinextras
+	url = ../qtwinextras.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtandroidextras"]
+	depends = qtbase
+	path = qtandroidextras
+	url = ../qtandroidextras.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwebsockets"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtwebsockets
+	url = ../qtwebsockets.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwebchannel"]
+	depends = qtbase
+	recommends = qtdeclarative qtwebsockets
+	path = qtwebchannel
+	url = ../qtwebchannel.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwebengine"]
+	depends = qtdeclarative
+	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
+	path = qtwebengine
+	url = ../qtwebengine.git
+	branch = 5.13.1
+	status = addon
+	priority = 10
+[submodule "qtcanvas3d"]
+	depends = qtdeclarative
+	path = qtcanvas3d
+	url = ../qtcanvas3d.git
+	branch = dev
+	status = ignore
+[submodule "qtwebview"]
+	depends = qtdeclarative
+	recommends = qtwebengine
+	path = qtwebview
+	url = ../qtwebview.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtquickcontrols2"]
+	depends = qtgraphicaleffects
+	recommends = qtimageformats
+	path = qtquickcontrols2
+	url = ../qtquickcontrols2.git
+	branch = 5.13.1
+	status = essential
+[submodule "qtpurchasing"]
+	depends = qtbase
+	recommends = qtdeclarative qtandroidextras
+	path = qtpurchasing
+	url = ../qtpurchasing.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtcharts"]
+	depends = qtbase
+	recommends = qtdeclarative qtmultimedia
+	path = qtcharts
+	url = ../qtcharts.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtdatavis3d"]
+	depends = qtbase
+	recommends = qtdeclarative qtmultimedia
+	path = qtdatavis3d
+	url = ../qtdatavis3d.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtvirtualkeyboard"]
+	depends = qtbase qtdeclarative qtsvg
+	recommends = qtmultimedia qtquickcontrols
+	path = qtvirtualkeyboard
+	url = ../qtvirtualkeyboard.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtgamepad"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtgamepad
+	url = ../qtgamepad.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtscxml"]
+	depends = qtbase qtdeclarative
+	path = qtscxml
+	url = ../qtscxml.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtspeech"]
+	depends = qtbase
+	recommends = qtdeclarative qtmultimedia
+	path = qtspeech
+	url = ../qtspeech.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtnetworkauth"]
+	depends = qtbase
+	path = qtnetworkauth
+	url = ../qtnetworkauth.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtremoteobjects"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtremoteobjects
+	url = ../qtremoteobjects.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtwebglplugin"]
+	depends = qtbase qtwebsockets
+	recommends = qtdeclarative
+	path = qtwebglplugin
+	url = ../qtwebglplugin.git
+	branch = 5.13.1
+	status = addon
+[submodule "qtlottie"]
+	depends = qtbase qtdeclarative
+	path = qtlottie
+	url = ../qtlottie.git
+	branch = 5.13.1
+	status = preview

Jenkinsfile

@@ -36,11 +36,9 @@ stage("Build Qt") {
             "qtpurchasing",
             "qtwebview",
             "qtscript",
-            "qtbluetooth",
             "qtlocation",
             "qtscxml",
             "qtspeech",
-            "qtwebgl",
             "qtlottie",
             "qtwebglplugin",
           ]
@@ -96,15 +94,19 @@ stage("Build Qt") {
           }
 
           dir("build") {
-            def python_path = "c:\\Python27;" ? profileName.startsWith("plex-windows") : "/Users/jenkins/.pyenv/versions/2.7.16:"
-            withEnv(["PATH=${python_path}${env.PATH}"]) {
+            def python_path = "c:\\Python27" ? profileName.startsWith("plex-windows") : "/Users/jenkins/.pyenv/versions/2.7.16"
+            withEnv(["PATH+PYTHON=${python_path}"]) {
               def flags = common_flags.join(" ")
               echo("Configure line: ${flags}")
               if (isMac) {
+                tools.run(command: "env")
                 tools.run(command: "../configure ${flags}")
               }
               else if (isWin) {
-                tools.run(command: "..\\configure.bat ${flags}")
+                tools.run(command: '''
+                  call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat" amd64
+                  call ..\\configure.bat ${flags}
+                  ''')
               }
             }
           }

qt.pro

@@ -13,8 +13,8 @@ TEMPLATE      = subdirs
 
 CONFIG += prepare_docs qt_docs_targets
 
-# Extract submodules from .gitmodules.
-lines = $$cat(.gitmodules, lines)
+# Extract submodules from .qtmodules.
+lines = $$cat(.qtmodules, lines)
 for (line, lines) {
     mod = $$replace(line, "^\\[submodule \"([^\"]+)\"\\]$", \\1)
     !equals(mod, $$line) {
@@ -26,11 +26,11 @@ for (line, lines) {
             val = $$replace(line, "^[^=]+= *", )
             module.$${module}.$$prop = $$split(val)
         } else {
-            error("Malformed line in .gitmodules: $$line")
+            error("Malformed line in .qtmodules: $$line")
         }
     }
 }
-QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
+QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.qtmodules
 
 QT_SKIP_MODULES =