Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-networkauth for openSUSE:Factory
checked in at 2021-05-10 15:38:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-networkauth (Old)
and /work/SRC/openSUSE:Factory/.qt6-networkauth.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-networkauth"
Mon May 10 15:38:34 2021 rev:4 rq:891711 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-networkauth/qt6-networkauth.changes
2021-04-06 17:32:08.607284045 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-networkauth.new.2988/qt6-networkauth.changes
2021-05-10 15:41:02.589165381 +0200
@@ -1,0 +2,16 @@
+Thu May 6 17:10:27 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.1.0:
+ * https://www.qt.io/blog/qt-6.1-released
+
+-------------------------------------------------------------------
+Fri Apr 23 14:11:38 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.1.0-rc.
+
+-------------------------------------------------------------------
+Tue Apr 13 06:37:28 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.1.0-beta3.
+
+-------------------------------------------------------------------
@@ -5,0 +22,11 @@
+
+-------------------------------------------------------------------
+Fri Mar 19 15:50:39 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.1.0-beta2
+
+-------------------------------------------------------------------
+Fri Mar 5 17:24:03 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 6.1.0-beta1
+ https://www.qt.io/blog/qt-6.1-beta-released
Old:
----
qtnetworkauth-everywhere-src-6.0.3.tar.xz
New:
----
qtnetworkauth-everywhere-src-6.1.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-networkauth.spec ++++++
--- /var/tmp/diff_new_pack.j923Z1/_old 2021-05-10 15:41:03.053163554 +0200
+++ /var/tmp/diff_new_pack.j923Z1/_new 2021-05-10 15:41:03.057163538 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-networkauth
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,8 @@
#
-%define real_version 6.0.3
-%define short_version 6.0
+%define real_version 6.1.0
+%define short_version 6.1
%define short_name qtnetworkauth
%define tar_name qtnetworkauth-everywhere-src
%define tar_suffix %{nil}
@@ -28,12 +28,12 @@
%endif
#
Name: qt6-networkauth%{?pkg_suffix}
-Version: 6.0.3
+Version: 6.1.0
Release: 0
Summary: Set of APIs to obtain limited access to online accounts and
HTTP services
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
URL: https://www.qt.io
-Source:
https://download.qt.io/official_releases/additional_libraries/%{short_version}/%{real_version}/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
+Source:
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-networkauth-rpmlintrc
BuildRequires: qt6-core-private-devel
BuildRequires: cmake(Qt6Core)
++++++ qtnetworkauth-everywhere-src-6.0.3.tar.xz ->
qtnetworkauth-everywhere-src-6.1.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.0.3/.cmake.conf
new/qtnetworkauth-everywhere-src-6.1.0/.cmake.conf
--- old/qtnetworkauth-everywhere-src-6.0.3/.cmake.conf 2021-03-26
06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/.cmake.conf 2021-05-03
11:49:09.000000000 +0200
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.0.3")
+set(QT_REPO_MODULE_VERSION "6.1.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.0.3/.qmake.conf
new/qtnetworkauth-everywhere-src-6.1.0/.qmake.conf
--- old/qtnetworkauth-everywhere-src-6.0.3/.qmake.conf 2021-03-26
06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/.qmake.conf 2021-05-03
11:49:09.000000000 +0200
@@ -3,5 +3,5 @@
DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
-MODULE_VERSION = 6.0.3
+MODULE_VERSION = 6.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.0.3/.tag
new/qtnetworkauth-everywhere-src-6.1.0/.tag
--- old/qtnetworkauth-everywhere-src-6.0.3/.tag 2021-03-26 06:53:40.000000000
+0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/.tag 2021-05-03 11:49:09.000000000
+0200
@@ -1 +1 @@
-b8edce14214a5aca23740b15801bd1ecaf07a872
+217fe1dae890c0d6bddfa8b6e65c69ae47f20770
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/coin/module_config.yaml
new/qtnetworkauth-everywhere-src-6.1.0/coin/module_config.yaml
--- old/qtnetworkauth-everywhere-src-6.0.3/coin/module_config.yaml
2021-03-26 06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/coin/module_config.yaml
2021-05-03 11:49:09.000000000 +0200
@@ -6,9 +6,6 @@
instructions:
Build:
- - type: EnvironmentVariable
- variableName: BUILD_DOCUMENTATION
- variableValue: "1"
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
Test:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.0.3/conanfile.py
new/qtnetworkauth-everywhere-src-6.1.0/conanfile.py
--- old/qtnetworkauth-everywhere-src-6.0.3/conanfile.py 2021-03-26
06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/conanfile.py 2021-05-03
11:49:09.000000000 +0200
@@ -28,6 +28,7 @@
from conans import ConanFile, tools, CMake
import os
+from pathlib import Path
class QtConanError(Exception):
@@ -36,7 +37,7 @@
class QtNetworkAuth(ConanFile):
name = "qtnetworkauth"
- version = "6.0.3"
+ version = "6.1.0"
license = "GPL-3.0+, Commercial Qt License Agreement"
author = "The Qt Company <https://www.qt.io/contact-us>"
url = "https://code.qt.io/cgit/qt/qtnetworkauth.git/";
@@ -45,22 +46,24 @@
"and HTTP services without exposing users' passwords."
topics = ("qt", "qt6", "network", "authorization")
settings = "os", "compiler", "build_type", "arch"
- options = {"shared": [True, False],
+ options = {"shared": [True, False, "default"],
"qt6": "ANY"} # this is needed to model unique package_id for
the Add-on build per used Qt6 version
- default_options = {"shared": False,
+ default_options = {"shared": "default", # default: Use the value of the
Qt build
"qt6": None}
exports_sources = "*", "!conan*.*"
+ # use commit ID as the RREV (recipe revision) if this is exported from
.git repository
+ revision_mode = "scm" if Path(Path(__file__).parent.resolve() /
".git").exists() else "hash"
def source(self):
# sources are installed next to recipe, no need to clone etc. sources
here
pass
def _get_cmake_prefix_path(self):
- # 'QT_PATH' provided as env variable in profile file which is part of
the Qt essential binary
+ # 'QTDIR' provided as env variable in profile file which is part of
the Qt essential binary
# package(s). Installed under .conan/profiles
- cmake_prefix_path = os.environ.get("QT_PATH")
+ cmake_prefix_path = os.environ.get("QTDIR")
if not cmake_prefix_path:
- raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to
point to Qt installation directory.")
+ raise QtConanError("'QTDIR' not defined! The 'QTDIR' needs to
point to Qt installation directory.")
print(f"CMAKE_PREFIX_PATH for '{self.name}/{self.version}' build is:
{cmake_prefix_path}")
return cmake_prefix_path
@@ -75,7 +78,7 @@
ext = ".bat" if tools.os_info.is_windows else ""
qtcmake = os.path.abspath(os.path.join(qt_install_path, "bin",
"qt-cmake" + ext))
if not os.path.exists(qtcmake):
- raise QtConanError(f"Unable to locate {qtcmake} from 'QT_PATH':
{qt_install_path}")
+ raise QtConanError(f"Unable to locate {qtcmake} from 'QTDIR':
{qt_install_path}")
return qtcmake
def _get_cmake_tool(self):
@@ -89,6 +92,10 @@
install_dir = os.path.join(os.getcwd(), "_install_tmp")
cmake.definitions["CMAKE_INSTALL_PREFIX"] = install_dir
+ # Use the value of the Qt build
+ if self.options.shared.value == "default":
+ del cmake.definitions["BUILD_SHARED_LIBS"]
+
cmake_toolchain_file = os.environ.get("CMAKE_TOOLCHAIN_FILE")
if cmake_toolchain_file:
cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = cmake_toolchain_file
@@ -125,7 +132,14 @@
def package_info(self):
self.cpp_info.libs = ["Qt6NetworkAuth"] # used for the actual library
filename, Ordered list with the library names
+ # Build and run environment for qmake, CMake
+ if tools.os_info.is_windows:
+ self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
+ self.env_info.QMAKEPATH.append(self.package_folder)
+
self.env_info.QT_ADDITIONAL_PACKAGES_PREFIX_PATH.append(self.package_folder)
+ self.env_info.Qt6NetworkAuth_DIR = os.path.join(self.package_folder,
+ os.path.normpath("lib/cmake/Qt6NetworkAuth"))
+
def deploy(self):
self.copy("*") # copy from current package
self.copy_deps("*") # copy from dependencies
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.0.3/dependencies.yaml
new/qtnetworkauth-everywhere-src-6.1.0/dependencies.yaml
--- old/qtnetworkauth-everywhere-src-6.0.3/dependencies.yaml 2021-03-26
06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/dependencies.yaml 2021-05-03
11:49:09.000000000 +0200
@@ -1,7 +1,4 @@
dependencies:
../qtbase:
- ref: 0ff1dc7110d373c85ce41e90073291b5e2eb16ad
+ ref: b2ebc64dd9914359fe8acf2bc9960e341e98cf80
required: true
- ../qttools:
- ref: 792adc3dd0f59a56273189f290c3edc327e140b7
- required: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/dist/changes-6.0.x
new/qtnetworkauth-everywhere-src-6.1.0/dist/changes-6.0.x
--- old/qtnetworkauth-everywhere-src-6.0.3/dist/changes-6.0.x 2021-03-26
06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/dist/changes-6.0.x 1970-01-01
01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Qt 6.0.x releases are bug fix releases to the top of Qt 6.0.0.
-
-List of changes compared to the previous patch release can be found from
-https://wiki.qt.io/Qt_6.0.x_Changes -wiki
-
-The goal has been to retain as much source compatibility with Qt 5.15 as
-possible, but some changes were inevitable to make Qt a better framework.
-
-To make it easier to port to Qt 6.0, we have created a porting guide to
-summarize those changes and provide guidance to handle them. In the guide, you
-can find links to articles about changes that may affect your application and
-help you transition from Qt 5.15 to Qt 6.0:
-
-https://doc.qt.io/qt-6/portingguide.html
-
-For more details refer to the online documentation of Qt 6.0:
-
-https://doc.qt.io/qt-6/index.html
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/examples/oauth/redditclient/conanfile.txt
new/qtnetworkauth-everywhere-src-6.1.0/examples/oauth/redditclient/conanfile.txt
---
old/qtnetworkauth-everywhere-src-6.0.3/examples/oauth/redditclient/conanfile.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/examples/oauth/redditclient/conanfile.txt
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1,5 @@
+[requires]
+qtnetworkauth/6.2.0@qt/snapshot
+
+[generators]
+virtualenv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/examples/oauth/twittertimeline/conanfile.txt
new/qtnetworkauth-everywhere-src-6.1.0/examples/oauth/twittertimeline/conanfile.txt
---
old/qtnetworkauth-everywhere-src-6.0.3/examples/oauth/twittertimeline/conanfile.txt
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/examples/oauth/twittertimeline/conanfile.txt
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1,5 @@
+[requires]
+qtnetworkauth/6.2.0@qt/snapshot
+
+[generators]
+virtualenv
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth2_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth2_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth2_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth2_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qabstractoauth2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauth_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qabstractoauth_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qabstractoauthreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1signature_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1signature_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1signature_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth1signature_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth1signature_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth2authorizationcodeflow_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
2021-03-26 06:53:40.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.0.3/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauthhttpserverreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth2_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth2_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth2_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth2_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qabstractoauth2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauth_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qabstractoauth_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qabstractoauthreplyhandler_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qabstractoauthreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1signature_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1signature_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1signature_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth1signature_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth1signature_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth2authorizationcodeflow_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/6.1.0/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
2021-05-03 11:49:09.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauthhttpserverreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/qtnetworkauthversion.h
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/qtnetworkauthversion.h
---
old/qtnetworkauth-everywhere-src-6.0.3/include/QtNetworkAuth/qtnetworkauthversion.h
2021-03-26 07:52:00.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.1.0/include/QtNetworkAuth/qtnetworkauthversion.h
2021-05-04 09:44:39.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTNETWORKAUTH_VERSION_H
#define QT_QTNETWORKAUTH_VERSION_H
-#define QTNETWORKAUTH_VERSION_STR "6.0.3"
+#define QTNETWORKAUTH_VERSION_STR "6.1.0"
-#define QTNETWORKAUTH_VERSION 0x060003
+#define QTNETWORKAUTH_VERSION 0x060100
#endif // QT_QTNETWORKAUTH_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/src/oauth/doc/qtnetworkauth.qdocconf
new/qtnetworkauth-everywhere-src-6.1.0/src/oauth/doc/qtnetworkauth.qdocconf
--- old/qtnetworkauth-everywhere-src-6.0.3/src/oauth/doc/qtnetworkauth.qdocconf
2021-03-26 06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/src/oauth/doc/qtnetworkauth.qdocconf
2021-05-03 11:49:09.000000000 +0200
@@ -26,7 +26,7 @@
tagfile = qtnetworkauth.tags
-depends += qtcore qtnetwork qtdoc
+depends += qtcore qtnetwork qtdoc qtcmake
headerdirs += ..
sourcedirs += ..
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.0.3/src/oauth/doc/src/qtnetworkauth.qdoc
new/qtnetworkauth-everywhere-src-6.1.0/src/oauth/doc/src/qtnetworkauth.qdoc
--- old/qtnetworkauth-everywhere-src-6.0.3/src/oauth/doc/src/qtnetworkauth.qdoc
2021-03-26 06:53:40.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.1.0/src/oauth/doc/src/qtnetworkauth.qdoc
2021-05-03 11:49:09.000000000 +0200
@@ -37,22 +37,32 @@
Currently, the supported authorization protocol is \l {https://oauth.net}
{OAuth}, versions 1 and 2.
- \section1 Getting Started
+ \section1 Using the Module
-//! [qtnetworkauth-usage]
- To use Qt Network Authorization classes, add this directive into C++ files:
+ Using a Qt module requires linking against the module library, either
+ directly or through other dependencies. Several build tools have dedicated
+ support for this, including CMake and qmake.
- \code
- #include <QtNetworkAuth>
+ \section2 Building with CMake
+
+ Use the \c find_package() command to locate the needed module components in
+ the Qt6 package:
+
+ \badcode
+ find_package(Qt6 COMPONENTS NetworkAuth REQUIRED)
+ target_link_libraries(mytarget PRIVATE Qt6::NetworkAuth)
\endcode
- To link against the Qt Network Authorization module, add this line to the
- project file:
+ See also the \l{Build with CMake} overview.
+
+ \section2 Building with qmake
- \code
- QT += network networkauth
+ To configure the module for building with qmake, add the module as a value
+ of the QT variable in the project's .pro file:
+
+ \badcode
+ QT += networkauth
\endcode
-//! [qtnetworkauth-usage]
\section1 Overview
@@ -102,9 +112,7 @@
\module QtNetworkAuth
\title Qt Network Authorization C++ Classes
\ingroup modules
- \qtcmakepackage Networkauth
+ \qtcmakepackage NetworkAuth
\qtvariable networkauth
\brief Provides classes for network authorization support (OAuth).
-
- \include qtnetworkauth.qdoc qtnetworkauth-usage
*/
