-
-
Notifications
You must be signed in to change notification settings - Fork 111
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
qt6(msvc): fix xerces.dll missing when running from Qt Creator #1144
Conversation
Merge Qt6 branch from main Seamly2D repository
This reverts commit d75d936.
…ngLiteral object initialisation
fix: Add xerces-c_3_2.dll to fix .dll no found issue, issue FashionFreedom#1018
🎉 PR Summary👍 The hard work and dedication are definitely paying off, folks! 🚀 Here's an easy-to-digest birds-eye view of the progress in this PR:
Let's keep this amazing momentum up and continue reaching for the stars! 🌟 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is the dll built, which version of xerces is used here? Please document that so that we can keep it in sync if an update to xerces is required
@@ -763,7 +763,7 @@ void ExportLayoutDialog::writeSettings() const | |||
*/ | |||
QString ExportLayoutDialog::modeString() const | |||
{ | |||
QString modeStr = QStringLiteral(); | |||
QString modeStr = QStringLiteral(""); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this unrelated change here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the compiler was complaining... the current Qt 5 is using QString modeStr = QStringLiteral("");
I must have made the change sometime between the Qt6 branch and now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found that the change was commited on the "develop" branch on this commit
I will omit this change from the PR because it only produces a clang warning and doesn't crash the program
src/libs/ifc/ifcdef.cpp
Outdated
@@ -64,6 +64,7 @@ | |||
#include <QString> | |||
|
|||
#include "../vmisc/diagnostic.h" | |||
#include "qobject.h" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this additional include?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is another place where the DRS fork and the Seamly repo diverged. This issue was fixed here. I'll change this PR to implement the fix in that PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See previous comments and inline
@DSCaskey - Would you be so kind as to enter into these comments how to fix the Linux Fails during builds on the latest GitHub runners? A bulleted list of steps to take would be beneficial. |
I can fix the windows mingw build in a separate PR. The linux builds are fine, no need to do there anything. And for the unit tests, they are still on the initial to do list since last May (#949), so I would suggest to tackle them also separately. |
I have fixed the CI topics in #1146, please review there @slspencer or @DSCaskey |
fix: Qt6 xerces.dll missing
TLDR
Fix issue that caused Qt6 Seamly2D
xerces-c_3_2.dll
not be be compiled by including it directly in the library folder.Description
For the last couple of weeks we have been working on understanding the issues that stood in the way of Qt6. We've been in commuincation with Sue (Github username: @slspencer). This PR originates from the "qt6" branch and is intend to be merged back into it.
Problem
This PR fixes issue presented in issue#1018. The issue states that when trying to compile Seamly2D on Windows 10 with MSVC19, the build failed. Screenshot below is taken from issue page:
Fix
The compiled xerces-c_3_2.dll is placed inside the
src/libs/xerces/msvc
folder. The .dll was taken from the Seamly xerces hosted assetsDemo
Video below shows both Qt6 version of Seamly2D compiling and being able to open files without freezing/crashing:
video demo of fixed Qt6 Seamly2D
Build Environment
TLDR: This was tested on a VM running Windows 10.
For more details on the build environment read the gist linked here