diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:21:32 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-06-11 13:31:01 +0300 |
| commit | 3cd4e0aa7961889eb06374885ed648f5b9bd85bc (patch) | |
| tree | 6a089aedea155b1f1a74b553f4d1b57c70554a8f /examples/pdf | |
| parent | 6d029165d1593c514db08c34d6b08a00a4435d5e (diff) | |
| parent | 38063a6332b9f948a0381763271e9a9ac7af0999 (diff) | |
Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensource6.2.9
Qt 6.2.9-lts release
Conflicts solved:
dependencies.yaml
examples/webenginewidgets/push-notifications/CMakeLists.txt
Change-Id: I0127c2575369f6939df89f3301659470d481b9bf
Diffstat (limited to 'examples/pdf')
| -rw-r--r-- | examples/pdf/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/pdf/multipage/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/pdf/multipage/viewer.qml | 2 | ||||
| -rw-r--r-- | examples/pdf/pdfviewer/CMakeLists.txt | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/examples/pdf/CMakeLists.txt b/examples/pdf/CMakeLists.txt index 265d2ab8f..f1d45d477 100644 --- a/examples/pdf/CMakeLists.txt +++ b/examples/pdf/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + qt_internal_add_example(pdfviewer) qt_internal_add_example(multipage) if(NOT TARGET Qt::Svg) diff --git a/examples/pdf/multipage/CMakeLists.txt b/examples/pdf/multipage/CMakeLists.txt index 92c2bce22..25cc726ed 100644 --- a/examples/pdf/multipage/CMakeLists.txt +++ b/examples/pdf/multipage/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(multipage LANGUAGES CXX) diff --git a/examples/pdf/multipage/viewer.qml b/examples/pdf/multipage/viewer.qml index fcf326869..d0b0a7263 100644 --- a/examples/pdf/multipage/viewer.qml +++ b/examples/pdf/multipage/viewer.qml @@ -412,7 +412,7 @@ ApplicationWindow { Layout.bottomMargin: 3 onAccepted: { sidebar.open() - sidebarTabs.setCurrentIndex(0) + sidebarTabs.setCurrentIndex(1) } Image { visible: searchField.text !== "" diff --git a/examples/pdf/pdfviewer/CMakeLists.txt b/examples/pdf/pdfviewer/CMakeLists.txt index 179734dc4..b664fb6f2 100644 --- a/examples/pdf/pdfviewer/CMakeLists.txt +++ b/examples/pdf/pdfviewer/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(pdfviewer LANGUAGES CXX) |