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.

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

Fixed build with -DQT_NO_CAST_FROM_ASCII #171

Merged
merged 1 commit into from
Sep 2, 2022
Merged

Conversation

tim-gromeyer
Copy link
Contributor

Closes #170

@@ -241,7 +240,7 @@ void MarkdownHighlighter::initHighlightingRules() {
HighlightingRule rule(HighlighterState::TrailingSpace);
rule.pattern = QRegularExpression(QStringLiteral("( +)$"));
// waqar144: don't use QStringLiteral here.
rule.shouldContain = QString(" \0");
rule.shouldContain = QString::fromLatin1(" \0");
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this works

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will work.

@pbek pbek merged commit c719b72 into pbek:develop Sep 2, 2022
@pbek
Copy link
Owner

pbek commented Sep 10, 2022

Unfortunately this PR breaks all openSUSE_Leap builds, like https://build.opensuse.org/package/binaries/home:pbek:QOwnNotes/desktop/openSUSE_Leap_42.3_Ports and Debian 9 builds, like https://build.opensuse.org/package/live_build_log/home:pbek:QOwnNotes/desktop/Debian_9.0/x86_64.

pbek added a commit to pbek/QOwnNotes that referenced this pull request Sep 10, 2022
@pbek
Copy link
Owner

pbek commented Sep 10, 2022

Fedora broken too... As is the old Windows XP build... https://ci.appveyor.com/project/pbek/qownnotes/builds/44736536

@Waqar144
Copy link
Contributor

The error was trivial, could have been fixed instead of full revert, would have been less effort too ¯_(ツ)_/¯.

@pbek
Copy link
Owner

pbek commented Sep 10, 2022

Getting all build systems to build a release again without breaking a lot of them again is ALWAYS a lot of work regardless of what code changes need to take place upfront. Reverting was a trivial amount of work.

@pbek
Copy link
Owner

pbek commented Sep 10, 2022

Getting all build systems to build a release again without breaking a lot of them again

I working on nothing else since almost an hour...

@Waqar144
Copy link
Contributor

Waqar144 commented Sep 10, 2022

Getting all build systems to build a release again without breaking a lot of them again is ALWAYS a lot of work

Yeah, but nothing special and nothing that hasn't been done before. On the other hand we lost a feature. Fixing the build was easy and possible, revert was unnecessary.

@Waqar144
Copy link
Contributor

Also, we can do Qt5.6 ci testing I think. Binaries are up here: https://download.qt.io/new_archive/qt/5.6/5.6.3/

One just needs to download and extract it and then push it to a github repo. Then we can just pull it during CI run and use this Qt to build QOwnNotes.

In the worst case, I can do a build before release to ensure it compiles.

@pbek
Copy link
Owner

pbek commented Sep 11, 2022

I'd be very happy if someone could integrate the old Qt archive into the CI build matrix! I'd even attempt to integrate that into the QOwnNotes repo once it runs here (will take more work and time tho)...

And If the last PR is easy to fix we can happily accept a new PR once there is a way to test it. 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build fails with -DQT_NO_CAST_FROM_ASCII
3 participants