Skip to content
Snippets Groups Projects
Commit 34103b44 authored by Yann Boucher's avatar Yann Boucher
Browse files

Better checks against Qt's version and improved support for copy data files to...

Better checks against Qt's version and improved support for copy data files to the executable directory
parent c9c93aca
No related branches found
No related tags found
No related merge requests found
Pipeline #79589 passed
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <QTimer> #include <QTimer>
#include <QElapsedTimer> #include <QElapsedTimer>
#if QT_VERSION >= 0x050000 && QT_VERSION < 0x060000 #if QT_VERSION_MAJOR == 5
#define BAD_APPLE_AUDIO #define BAD_APPLE_AUDIO
#endif #endif
......
...@@ -108,8 +108,10 @@ CONFIG(debug, debug|release) { ...@@ -108,8 +108,10 @@ CONFIG(debug, debug|release) {
DEBUG_OR_RELEASE = release DEBUG_OR_RELEASE = release
} }
# On copie les fichiers de pattern et de modèle vers le dossier d'exécution # On copie les fichiers de pattern, de modèle, etc... vers le dossier d'exécution
#message($$system($$QMAKE_COPY_DIR $$shell_quote($$PWD/../patterns) $$shell_quote($$OUT_PWD/$$DEBUG_OR_RELEASE/patterns))) # https://evileg.com/en/post/476/
#message($$system($$QMAKE_COPY_DIR $$shell_quote($$PWD/../patterns) $$shell_quote($$OUT_PWD/patterns))) CONFIG += file_copies
#message($$system($$QMAKE_COPY_DIR $$shell_quote($$PWD/../models) $$shell_quote($$OUT_PWD/$$DEBUG_OR_RELEASE/models))) COPIES += data
#message($$system($$QMAKE_COPY_DIR $$shell_quote($$PWD/../models) $$shell_quote($$OUT_PWD/models)))
data.files = $$files($$PWD/../patterns) $$files($$PWD/../models) $$files($$PWD/../configurations) $$files($$PWD/../extras)
data.path = $$OUT_PWD
#include "propertyvisitors.hpp" #include "propertyvisitors.hpp"
#include <QtGlobal>
#include <QGroupBox> #include <QGroupBox>
#include <QPushButton> #include <QPushButton>
#include <QDebug> #include <QDebug>
...@@ -140,7 +139,9 @@ void UIBuilderVisitor::visit(HelpProperty& prop) ...@@ -140,7 +139,9 @@ void UIBuilderVisitor::visit(HelpProperty& prop)
[msg]() { [msg]() {
QMessageBox* box = new QMessageBox(QMessageBox::NoIcon, "Help", msg, QMessageBox* box = new QMessageBox(QMessageBox::NoIcon, "Help", msg,
QMessageBox::Ok); QMessageBox::Ok);
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
box->setTextFormat(Qt::MarkdownText); box->setTextFormat(Qt::MarkdownText);
#endif
box->setTextInteractionFlags(Qt::TextBrowserInteraction); box->setTextInteractionFlags(Qt::TextBrowserInteraction);
box->show(); box->show();
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment