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