diff --git a/src/interface.cpp b/src/interface.cpp index b9b1047e2ae8c6d83babdb342797327d1ca53b14..a315e9efd9db097e1310fa8fc7142b370d62595c 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -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 diff --git a/src/src.pro b/src/src.pro index 97ec7d3e10734590e632b8d43ed95936d2ef24b3..85e2b3dad06903a987071b682c2229968377d76c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -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 diff --git a/src/uibuildervisitor.cpp b/src/uibuildervisitor.cpp index f391fca5af7c0b0aefe66e1f35f11829fce294b0..ebf61e4599b9db7486cc59148cc388563c587a4e 100644 --- a/src/uibuildervisitor.cpp +++ b/src/uibuildervisitor.cpp @@ -1,7 +1,6 @@ #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(); });