Skip to content
Snippets Groups Projects
Commit 545fe471 authored by Mikko Gronoff's avatar Mikko Gronoff
Browse files

meta-qt5: update layer


Update to latest content in Qt5 dev branch.

Changelog:
0fb09ca qtsystems: revert SRCREV to correct one
7388cd4 meta-qt5: update submodules
77ba83f Merge remote-tracking branch 'qtyocto/5.13' into dev

Change-Id: Ie2661cecee86ebe60eab6050251d835db2388368
Reviewed-by: default avatarSamuli Piippo <samuli.piippo@qt.io>
parent 030397e7
No related branches found
No related tags found
No related merge requests found
From 86fa457545a2f750a34984106e5863a46dd5ea1e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 5 Aug 2019 08:58:14 +0300
Subject: [PATCH] Enable viewer for boot2qt builds
---
tools/tools.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/tools.pro b/tools/tools.pro
index 7c62eae..a836fe6 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
CONFIG += ordered
-!boot2qt:!integrity:!qnx {
+!integrity:!qnx {
SUBDIRS += viewer
}
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
##
## $QT_BEGIN_LICENSE:GPL$
## 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 https://www.qt.io/terms-conditions. For further
## information use the contact form at https://www.qt.io/contact-us.
##
## GNU General Public License Usage
## Alternatively, this file may be used under the terms of the GNU
## General Public License version 3 or (at your option) any later version
## approved by the KDE Free Qt Foundation. The licenses are as published by
## the Free Software Foundation and appearing in the file LICENSE.GPL3
## included in the packaging of this file. Please review the following
## information to ensure the GNU General Public License requirements will
## be met: https://www.gnu.org/licenses/gpl-3.0.html.
##
## $QT_END_LICENSE$
##
############################################################################
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-Enable-viewer-for-boot2qt-builds.patch"
......@@ -27,7 +27,7 @@
path="sources/meta-openembedded"/>
<project name="meta-qt5"
remote="qtyocto"
revision="7d0ec758e43f46f067464da0a4f4f94dbfec9556"
revision="0fb09cabc2499f52113630dacbea7524402e7793"
path="sources/meta-qt5"/>
<project name="meta-mingw"
remote="qtyocto"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment