Compare commits

...

5 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
f1a9b684bf Update submodules on '5.10' in qt5
Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-07 03:52:53 +00:00
Liang Qi
0aecf8a1df Update qtwebengine only
Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 07:24:19 +00:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Liang Qi
d068364935 Update submodules on '5.10' in qt5
Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-03 05:14:29 +00:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
42 changed files with 77 additions and 41 deletions

1
.gitmodules vendored
View File

@@ -298,7 +298,6 @@
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.10

View File

@@ -0,0 +1,37 @@
#!/bin/bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2017 Pelagicore AG
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# refresh local certificates
sudo subscription-manager refresh

2
qt3d

Submodule qt3d updated: ced895b361...aad5445359

2
qtbase

Submodule qtbase updated: 76a6b32942...3e5dde4766

2
qtdoc

Submodule qtdoc updated: 6f5b2fae09...f9cfb3d4f1

Submodule qtscxml updated: 3ba4176568...2143fd3362

2
qtsvg

Submodule qtsvg updated: dc9e39eb67...f1ba95141c

Submodule qttools updated: 936ae1fdd4...4e612c7d3d