Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[qxlsx] Use version range for Qt #25422

Merged
merged 7 commits into from
Oct 1, 2024
Merged

[qxlsx] Use version range for Qt #25422

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd83d87
Use version range for Qt
uilianries Sep 26, 2024
a285d00
Drop version 1.4.3
uilianries Sep 26, 2024
f1395ec
Use transitive headers for Qt
uilianries Sep 26, 2024
ebce50a
Use transitive libs for Qt
uilianries Sep 26, 2024
9494438
Build on Windows
uilianries Sep 26, 2024
1f75c83
Adapt CMake file name
uilianries Sep 26, 2024
a5ea315
Remove test v1 package
uilianries Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions recipes/qxlsx/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,3 @@ sources:
"1.4.4":
url: "https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip"
sha256: "3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675"
"1.4.3":
url: "https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.3.zip"
sha256: "d2f7c6aff71f2f30ade8d8020682e36a3d63f422a5d2f1c5831b55573241bd4a"
patches:
"1.4.3":
- patch_file: "patches/1.4.3/0001-allow-shared.patch"
patch_type: "conan"
patch_source: "https://github.com/QtExcel/QXlsx/pull/197"
- patch_file: "patches/1.4.3/0002-add-install-target.patch"
patch_type: "conan"
patch_source: "https://github.com/QtExcel/QXlsx/pull/197"
4 changes: 3 additions & 1 deletion recipes/qxlsx/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("qt/5.15.9")
# INFO: QXlsx/xlsxdocument.h includes QtGlobal
# INFO: transitive libs: undefined reference to symbol '_ZN10QArrayData10deallocateEPS_mm@@Qt_5'
self.requires("qt/[~5.15]", transitive_headers=True, transitive_libs=True)

def build_requirements(self):
if Version(self.version) >= "1.4.4":
Expand Down
218 changes: 0 additions & 218 deletions recipes/qxlsx/all/patches/1.4.3/0001-allow-shared.patch
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions recipes/qxlsx/all/patches/1.4.3/0002-add-install-target.patch
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions recipes/qxlsx/all/test_package/test_package.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
#include <iostream>
#include <QBuffer>
#include <xlsxdocument.h>

int main() {
QBuffer device;
device.open(QIODevice::WriteOnly);

QXlsx::Document xlsx1;
xlsx1.write("A1", true);
xlsx1.write("A2", false);
xlsx1.saveAs(&device);
// INFO: Document does not exist. Only for test package purposes.
QXlsx::Document xlsxR("Test.xlsx");
xlsxR.load();

return 0;
}
2 changes: 0 additions & 2 deletions recipes/qxlsx/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ versions:
folder: "all"
"1.4.4":
folder: "all"
"1.4.3":
folder: "all"
Loading