diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | coin/module_config.yaml | 17 | ||||
| -rw-r--r-- | coin/product_dependencies.yaml | 2 | ||||
| -rw-r--r-- | configure.json | 10 | ||||
| -rw-r--r-- | dependencies.yaml | 26 | ||||
| -rw-r--r-- | qtwebengine.pro | 15 | ||||
| -rw-r--r-- | src/sync.profile | 14 | ||||
| -rw-r--r-- | sync.profile | 15 |
9 files changed, 48 insertions, 55 deletions
diff --git a/.cmake.conf b/.cmake.conf index 930548045..4e73b3d60 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.0") +set(QT_REPO_MODULE_VERSION "6.2.0") diff --git a/.qmake.conf b/.qmake.conf index 1a6b29792..f96b92c5c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 6.0.2 +MODULE_VERSION = 6.2.0 diff --git a/coin/module_config.yaml b/coin/module_config.yaml index e8b9a7758..2ae2063c6 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,4 +1,17 @@ version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + instructions: - Build: [] - Test: [] + Build: + - type: EnvironmentVariable + variableName: CMAKE_BUILD_TIMEOUT + variableValue: "36000" + - type: EnvironmentVariable + variableName: CMAKE_BUILD_OUTPUT_TIMEOUT + variableValue: "3600" + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + Test: + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml index c248d7b6b..101d8d04e 100644 --- a/coin/product_dependencies.yaml +++ b/coin/product_dependencies.yaml @@ -1,3 +1,3 @@ dependencies: ../qt5.git: - ref: "6.0" + ref: refs/changes/94/340894/11 diff --git a/configure.json b/configure.json deleted file mode 100644 index ab8153508..000000000 --- a/configure.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "subconfigs": [ - "src/buildtools", - "src/core", - "src/webenginequick", - "src/webenginewidgets", - "src/pdf", - "src/pdfwidgets" - ] -} diff --git a/dependencies.yaml b/dependencies.yaml index 43ad31057..7e2950afd 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,6 +1,12 @@ dependencies: + ../qtbase: + ref: 640eb55c130c6c2c982dc212a8a5bd2b8fb7a225 + required: true + ../qtshadertools: + ref: cf08b62f103b8e2bc3e9a117ccd262d7a278a260 + required: true ../qtdeclarative: - ref: fa87052d56526e1529e694fb1c69c69eec38f2fd + ref: 3e9cece90ae7097bbf915ef1e941390abecf28a8 required: true # ../qtlocation: # ref: a8793c6d9695498b3a53793f21859421262b4541 @@ -8,12 +14,12 @@ dependencies: # ../qtquickcontrols: # ref: 59749d56d666a6687fcedc2f7892080467db8574 # required: false - ../qtquickcontrols2: - ref: 9a19ec26f45e7382431f52136f03887cfaa04b66 - required: false - ../qttools: - ref: 3fd594493c3ba31639a7515b901554456a90b4c7 - required: false - ../qtwebchannel: - ref: 0e13bd10bc7f31b1540987faeb0e3c83668daa3e - required: false +# ../qtquickcontrols2: +# ref: 9a19ec26f45e7382431f52136f03887cfaa04b66 +# required: false +# ../qttools: +# ref: 3fd594493c3ba31639a7515b901554456a90b4c7 +# required: false +# ../qtwebchannel: +# ref: 0e13bd10bc7f31b1540987faeb0e3c83668daa3e +# required: false diff --git a/qtwebengine.pro b/qtwebengine.pro deleted file mode 100644 index 4db530030..000000000 --- a/qtwebengine.pro +++ /dev/null @@ -1,15 +0,0 @@ -requires(qtHaveModule(gui)) -load(qt_parts) -load(functions) - -QMAKE_DISTCLEAN += .qmake.cache - -OTHER_FILES = \ - tools/buildscripts/* \ - tools/scripts/* \ - config.tests/khr/* \ - config.tests/libcap/* \ - config.tests/libvpx/* \ - config.tests/snappy/* \ - config.tests/re2/* \ - mkspecs/features/* diff --git a/src/sync.profile b/src/sync.profile new file mode 100644 index 000000000..3d5550f62 --- /dev/null +++ b/src/sync.profile @@ -0,0 +1,14 @@ +%modules = ( # path to module name map + "QtWebEngineQuick" => "$basedir/webenginequick", + "QtWebEngineWidgets" => "$basedir/webenginewidgets", + "QtWebEngineCore" => "$basedir/core/api", + "QtPdf" => "$basedir/pdf", + "QtPdfWidgets" => "$basedir/pdfwidgets", +); +%moduleheaders = ( # restrict the module headers to those found in relative path + "QtWebEngineQuick" => "api", + "QtWebEngineWidgets" => "api", + "QtPdf" => "api" +); +%classnames = ( +); diff --git a/sync.profile b/sync.profile deleted file mode 100644 index b68bcd4bb..000000000 --- a/sync.profile +++ /dev/null @@ -1,15 +0,0 @@ -%modules = ( # path to module name map - "QtWebEngineQuick" => "$basedir/src/webenginequick", - "QtWebEngineWidgets" => "$basedir/src/webenginewidgets", - "QtWebEngineCore" => "$basedir/src/core", - "QtPdf" => "$basedir/src/pdf", - "QtPdfWidgets" => "$basedir/src/pdfwidgets", -); -%moduleheaders = ( # restrict the module headers to those found in relative path - "QtWebEngineQuick" => "api", - "QtWebEngineWidgets" => "api", - "QtWebEngineCore" => "api", - "QtPdf" => "api" -); -%classnames = ( -); |