Skip to content
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.

Sign up for GitHub

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

FEXQonfig: Minor followup changes #4029

Merged
merged 4 commits into from
Sep 3, 2024
Merged

FEXQonfig: Minor followup changes #4029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e6a22f
FEXQonfig: Add missing license identifiers
neobrain Sep 3, 2024
b327d7a
FEXQonfig: Drop superfluous include
neobrain Sep 3, 2024
099211f
FEXQonfig: Tune padding a little
neobrain Sep 3, 2024
fc76d4e
CMake: Suppress warning about Qt 6 not being found
neobrain Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions FEXCore/Source/Utils/SpinWaitLock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
#include "Utils/SpinWaitLock.h"

namespace FEXCore::Utils::SpinWaitLock {
Expand Down
2 changes: 1 addition & 1 deletion Source/Tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
#include "Main.h"

#include <Common/Config.h>
Expand Down
3 changes: 1 addition & 2 deletions Source/Tools/FEXQonfig/Main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
#include <QStandardItemModel>
#include <QQmlApplicationEngine>

Expand Down Expand Up @@ -56,8 +57,6 @@ public slots:
QUrl getBaseUrl() const;
};

#include <QApplication>

class ConfigRuntime : public QObject {
Q_OBJECT

Expand Down
5 changes: 2 additions & 3 deletions Source/Tools/FEXQonfig/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
Expand Down Expand Up @@ -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"
Expand All @@ -620,6 +618,7 @@ ApplicationWindow {
}

ConfigCheckBox {
topPadding: 4
text: qsTr("Enable non-tearing split-lock atomics")
config: "StrictInProcessSplitLocks"
}
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt5/FileDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick.Dialogs 1.3 as FromQt

FromQt.FileDialog {
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt5/FolderDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick.Dialogs 1.3 as FromQt

FromQt.FileDialog {
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt5/MessageDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick 2.15
import QtQuick.Dialogs 1.3 as FromQt

Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt6/FileDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick.Dialogs as FromQt

FromQt.FileDialog {
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt6/FolderDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick.Dialogs as FromQt

FromQt.FolderDialog {
Expand Down
1 change: 1 addition & 0 deletions Source/Tools/FEXQonfig/qt6/MessageDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// SPDX-License-Identifier: MIT
import QtQuick.Dialogs as FromQt

FromQt.MessageDialog {
Expand Down
Loading