Version 0.6

Amend extra fix for .pri files.
semlanik · May 31, 2021 · 053f834 · 053f834
1 parent a96d916
commit 053f834
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 11 deletions.
diff --git a/.ci/qt_installer_windows.qs b/.ci/qt_installer_windows.qs
@@ -42,6 +42,8 @@ Controller.prototype.ObligationsPageCallback = function()
 {
     var page = gui.pageWidgetByObjectName("ObligationsPage");
     page.obligationsAgreement.setChecked(true);
+    var individualPerson = gui.findChild(page, "IndividualPerson");
+    individualPerson.setChecked(true);
     page.completeChanged();
     gui.clickButton(buttons.NextButton, 2000);
 }

diff --git a/.github/workflows/branchpush.yml b/.github/workflows/branchpush.yml
@@ -9,6 +9,7 @@ on:
      - 0.3
      - 0.4
      - 0.5
+     - 0.6
      - ci_check
 jobs:
   build-ubuntu:

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,30 @@
+2021-05-23 version 0.6.0 (generator/QtProtobuf/QtGrpc)
+    QtProtobuf
+    * Split generator and QtProtobuf library
+    * Add standalone tests build
+    * Change the installation folder for the .pri files and qml modules
+    * Initial cross-compiling support
+    * Change the lookup mechanism of 3rdparty components
+    * Add github workflow to build Windows release packages
+    * Fix transparent types converter
+    * Replace ASSERT_EQ by EXPECT_EQ in converter tests
+    * Make microjson build-in only
+    * Tune coverage collecting procedure
+    * Add support of the cycling dependency between nested types
+    QtGrpc
+    * Fix subscription read buffer not clearing on subsequent calls
+    * Add a client QML call with the return value as a parameter
+    * Fixes for newer grpc versions
+    * Add implementation of a QAbstractGrpcChannel based on gRPC C++ native library
+    * Add timeout for subscription error
+    * Add disconnect method for subscription
+    generator
+    * Implement extra namespace for the generated code
+    * Add reflection of the json name to the property ordering
+    * Change the name of QML list properties. Keep the protobuf name for the
+      QML list prtoperties.
+    * Add field enum generation
+
 2020-08-31 version 0.5.0 (generator/QtProtobuf/QtGrpc)
     QtProtobuf
     * Change the qmake executable lookup way

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 cmake_policy(VERSION 3.6...3.14)
 
-set(QT_PROTOBUF_VERSION 0.5.0)
+set(QT_PROTOBUF_VERSION 0.6.0)
 set(QT_PROTOBUF_NAMESPACE QtProtobuf)
 set(QT_PREFIX Qt)
 set(QT_VERSIONED_PREFIX Qt5)

diff --git a/cmake/QtProtobufInternalHelpers.cmake b/cmake/QtProtobufInternalHelpers.cmake
@@ -415,6 +415,7 @@ endfunction()
 function(qt_protobuf_internal_generate_pri target)
     string(TOLOWER "${target}" target_lower)
     set(pri_name "qt_lib_${target_lower}.pri")
+    get_target_property(QT_PROTOBUF_LIBRARY_OUTPUT_NAME ${target} OUTPUT_NAME)
 
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${pri_name}.in"
         "${QT_PROTOBUF_BINARY_DIR}/${pri_name}" @ONLY

diff --git a/src/grpc/qt_lib_grpc.pri.in b/src/grpc/qt_lib_grpc.pri.in
@@ -1,7 +1,7 @@
 QT.grpc.VERSION = @QT_PROTOBUF_VERSION@
-QT.grpc.name = QtGrpc
-QT.grpc.module = QtGrpc
-QT.grpc.includes = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/QtGrpc
+QT.grpc.name = Qt@target@
+QT.grpc.module = @QT_PROTOBUF_LIBRARY_OUTPUT_NAME@
+QT.grpc.includes = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@QT_PROTOBUF_NAMESPACE@@target@
 QT.grpc.private_includes =
 QT.grpc.libs = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
 QT.grpc.depends = core network protobuf

diff --git a/src/protobuf/qt_lib_protobuf.pri.in b/src/protobuf/qt_lib_protobuf.pri.in
@@ -1,7 +1,7 @@
 QT.protobuf.VERSION = @QT_PROTOBUF_VERSION@
-QT.protobuf.name = QtProtobuf
-QT.protobuf.module = QtProtobuf
-QT.protobuf.includes = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/QtProtobuf
+QT.protobuf.name = Qt@target@
+QT.protobuf.module = @QT_PROTOBUF_LIBRARY_OUTPUT_NAME@
+QT.protobuf.includes = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@QT_PROTOBUF_NAMESPACE@@target@
 QT.protobuf.private_includes =
 QT.protobuf.libs = @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
 QT.protobuf.depends = core qml

diff --git a/tests/test_extra_namespace_qml/qml/tst_extra_namespace.qml b/tests/test_extra_namespace_qml/qml/tst_extra_namespace.qml
@@ -26,7 +26,7 @@
 import QtQuick 2.12
 import QtTest 1.0
 
-import QtProtobuf 0.5
+import QtProtobuf 0.6
 import MyTestNamespace.qtprotobufnamespace.tests 1.0
 
 TestCase {

diff --git a/tests/test_grpc_qml/qml/tst_grpc.qml b/tests/test_grpc_qml/qml/tst_grpc.qml
@@ -26,8 +26,8 @@
 import QtQuick 2.12
 import QtTest 1.0
 
-import QtProtobuf 0.5
-import QtGrpc 0.5
+import QtProtobuf 0.6
+import QtGrpc 0.6
 import qtprotobufnamespace.tests 1.0
 
 TestCase {

diff --git a/tests/test_qml/qml/tst_simple.qml b/tests/test_qml/qml/tst_simple.qml
@@ -26,7 +26,7 @@
 import QtQuick 2.12
 import QtTest 1.0
 
-import QtProtobuf 0.5
+import QtProtobuf 0.6
 import qtprotobufnamespace.tests 1.0
 import qtprotobufnamespace.tests.nested 1.0
 import qtprotobufnamespace.tests.nested.NestedFieldMessage 1.0 as NestedFieldMessage_
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ on: @@
          - 0.3
          - 0.4
          - 0.5
+         - 0.6
          - ci_check
     jobs:
       build-ubuntu:
@@ Expand Down @@