diff --git a/FEXCore/Source/Utils/SpinWaitLock.cpp b/FEXCore/Source/Utils/SpinWaitLock.cpp index f6b2ff416a..05859cf311 100644 --- a/FEXCore/Source/Utils/SpinWaitLock.cpp +++ b/FEXCore/Source/Utils/SpinWaitLock.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #include "Utils/SpinWaitLock.h" namespace FEXCore::Utils::SpinWaitLock { diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt index 2b41cb8b10..ab785de3c6 100644 --- a/Source/Tools/CMakeLists.txt +++ b/Source/Tools/CMakeLists.txt @@ -4,7 +4,7 @@ if (NOT MINGW_BUILD) if (USE_FEXCONFIG_TOOLKIT STREQUAL "imgui") add_subdirectory(FEXConfig/) elseif (USE_FEXCONFIG_TOOLKIT STREQUAL "qt") - find_package(Qt6 COMPONENTS Qml Quick Widgets) + find_package(Qt6 COMPONENTS Qml Quick Widgets QUIET) if (NOT Qt6_FOUND) find_package(Qt5 COMPONENTS Qml Quick Widgets REQUIRED) endif() diff --git a/Source/Tools/FEXQonfig/Main.cpp b/Source/Tools/FEXQonfig/Main.cpp index a7ab856df8..58be81becc 100644 --- a/Source/Tools/FEXQonfig/Main.cpp +++ b/Source/Tools/FEXQonfig/Main.cpp @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #include "Main.h" #include diff --git a/Source/Tools/FEXQonfig/Main.h b/Source/Tools/FEXQonfig/Main.h index 3f22571ab4..a70cbb1e9f 100644 --- a/Source/Tools/FEXQonfig/Main.h +++ b/Source/Tools/FEXQonfig/Main.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT #include #include @@ -56,8 +57,6 @@ public slots: QUrl getBaseUrl() const; }; -#include - class ConfigRuntime : public QObject { Q_OBJECT diff --git a/Source/Tools/FEXQonfig/main.qml b/Source/Tools/FEXQonfig/main.qml index 3221060a9e..b56b486575 100644 --- a/Source/Tools/FEXQonfig/main.qml +++ b/Source/Tools/FEXQonfig/main.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 @@ -592,19 +593,16 @@ ApplicationWindow { visible: tso2.checked ConfigCheckBox { - leftPadding: 24 text: qsTr("... for vector instructions") tooltip: qsTr("Controls TSO emulation on vector load/store instructions") config: "VectorTSOEnabled" } ConfigCheckBox { - leftPadding: 24 text: qsTr("... for memcpy instructions") tooltip: qsTr("Controls TSO emulation on memcpy/memset instructions") config: "MemcpySetTSOEnabled" } ConfigCheckBox { - leftPadding: 24 text: qsTr("... for unaligned half-barriers") tooltip: qsTr("Controls half-barrier TSO emulation on unaligned load/store instructions") config: "HalfBarrierTSOEnabled" @@ -620,6 +618,7 @@ ApplicationWindow { } ConfigCheckBox { + topPadding: 4 text: qsTr("Enable non-tearing split-lock atomics") config: "StrictInProcessSplitLocks" } diff --git a/Source/Tools/FEXQonfig/qt5/FileDialog.qml b/Source/Tools/FEXQonfig/qt5/FileDialog.qml index 6860b1f45a..abaebcf884 100644 --- a/Source/Tools/FEXQonfig/qt5/FileDialog.qml +++ b/Source/Tools/FEXQonfig/qt5/FileDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick.Dialogs 1.3 as FromQt FromQt.FileDialog { diff --git a/Source/Tools/FEXQonfig/qt5/FolderDialog.qml b/Source/Tools/FEXQonfig/qt5/FolderDialog.qml index 8866bdd1f5..42835b7b5f 100644 --- a/Source/Tools/FEXQonfig/qt5/FolderDialog.qml +++ b/Source/Tools/FEXQonfig/qt5/FolderDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick.Dialogs 1.3 as FromQt FromQt.FileDialog { diff --git a/Source/Tools/FEXQonfig/qt5/MessageDialog.qml b/Source/Tools/FEXQonfig/qt5/MessageDialog.qml index a5c8624b75..5e51975843 100644 --- a/Source/Tools/FEXQonfig/qt5/MessageDialog.qml +++ b/Source/Tools/FEXQonfig/qt5/MessageDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick 2.15 import QtQuick.Dialogs 1.3 as FromQt diff --git a/Source/Tools/FEXQonfig/qt6/FileDialog.qml b/Source/Tools/FEXQonfig/qt6/FileDialog.qml index c4deba5e45..07040daaed 100644 --- a/Source/Tools/FEXQonfig/qt6/FileDialog.qml +++ b/Source/Tools/FEXQonfig/qt6/FileDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick.Dialogs as FromQt FromQt.FileDialog { diff --git a/Source/Tools/FEXQonfig/qt6/FolderDialog.qml b/Source/Tools/FEXQonfig/qt6/FolderDialog.qml index f58a348b87..4a9cb667b5 100644 --- a/Source/Tools/FEXQonfig/qt6/FolderDialog.qml +++ b/Source/Tools/FEXQonfig/qt6/FolderDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick.Dialogs as FromQt FromQt.FolderDialog { diff --git a/Source/Tools/FEXQonfig/qt6/MessageDialog.qml b/Source/Tools/FEXQonfig/qt6/MessageDialog.qml index 0afae7957d..87d5f5c134 100644 --- a/Source/Tools/FEXQonfig/qt6/MessageDialog.qml +++ b/Source/Tools/FEXQonfig/qt6/MessageDialog.qml @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: MIT import QtQuick.Dialogs as FromQt FromQt.MessageDialog {