The popups have been moved inside the scope of the ProfileButtons. Since the popups open based on the location of their parents, they are currently opening underneath where they used to open. Since the profiles and ptt settings do not work anyway, this is seen as acceptable.
172 lines
6.4 KiB
Prolog
172 lines
6.4 KiB
Prolog
#-------------------------------------------------
|
|
#
|
|
# Project created by QtCreator 2015-06-10T16:57:45
|
|
#
|
|
#-------------------------------------------------
|
|
|
|
QT += core gui qml quick multimedia widgets
|
|
CONFIG += c++1z
|
|
|
|
DEFINES += ELPP_THREAD_SAFE ELPP_QT_LOGGING ELPP_NO_DEFAULT_LOG_FILE
|
|
|
|
lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.6 or higher")
|
|
lessThan(QT_MINOR_VERSION, 6): error("requires Qt 5.6 or higher")
|
|
|
|
TARGET = AdvancedSettings
|
|
TEMPLATE = app
|
|
|
|
*msvc* {
|
|
#Removing -W3 from both FLAGS is necessary, otherwise compiler will give
|
|
#D9025: overriding '/W4' with '/W3'
|
|
QMAKE_CFLAGS_WARN_ON -= -W3
|
|
QMAKE_CXXFLAGS_WARN_ON -= -W3
|
|
#C4127 is a warning in qvarlengtharray.h that can not be turned off
|
|
#on the current version of MSVC.
|
|
QMAKE_CXXFLAGS += /W4 /wd4127
|
|
# The codecvt header being used in AudioManagerWindows.cpp is deprecated by the standard,
|
|
# but no suitable replacement has been standardized yet. It is possible to use the Windows
|
|
# specific MultiByteToWideChar() and WideCharToMultiByte() from <Windows.h>
|
|
DEFINES += _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
|
|
!*clang-msvc {
|
|
#win32-clang-msvc is unable to correctly build the first time
|
|
#with warnings as errors on. There seems to be an issue with the moc_predefs.h
|
|
#file not being built correctly when /WX is on. Until the issue is fixed,
|
|
#win32-clang-msvc is built without /WX.
|
|
QMAKE_CXXFLAGS += /WX
|
|
}
|
|
}
|
|
|
|
win32-clang-msvc{
|
|
#clang-msvc does not enable the c++17 flag with qmake's c++1z flag.
|
|
QMAKE_CXXFLAGS += /std:c++17
|
|
}
|
|
|
|
*g++* {
|
|
#g++-7 is needed for C++17 features. travis does not supply this by default.
|
|
QMAKE_CXX = g++-7
|
|
QMAKE_CXXFLAGS += -Werror
|
|
}
|
|
|
|
#Look for anything clang that is not clang-msvc, since it does not
|
|
#allow all the same switches as regular clang.
|
|
*clang|*clang-g++|*clang-libc++ {
|
|
QMAKE_CXXFLAGS += -Werror
|
|
#All includes from the third-party directory will not warn.
|
|
QMAKE_CXXFLAGS += --system-header-prefix=third-party
|
|
}
|
|
SOURCES += src/main.cpp\
|
|
src/overlaycontroller.cpp \
|
|
src/tabcontrollers/AudioTabController.cpp \
|
|
src/tabcontrollers/ChaperoneTabController.cpp \
|
|
src/tabcontrollers/FixFloorTabController.cpp \
|
|
src/tabcontrollers/MoveCenterTabController.cpp \
|
|
src/tabcontrollers/SettingsTabController.cpp \
|
|
src/tabcontrollers/StatisticsTabController.cpp \
|
|
src/tabcontrollers/SteamVRTabController.cpp \
|
|
src/tabcontrollers/ReviveTabController.cpp \
|
|
src/tabcontrollers/UtilitiesTabController.cpp \
|
|
src/tabcontrollers/PttController.cpp \
|
|
src/tabcontrollers/AccessibilityTabController.cpp \
|
|
src/utils/ChaperoneUtils.cpp \
|
|
src/tabcontrollers/audiomanager/AudioManagerDummy.cpp \
|
|
src/tabcontrollers/keyboardinput/KeyboardInputDummy.cpp \
|
|
src/overlaycontroller/openvr_init.cpp \
|
|
src/ivrinput/ivrinput.cpp
|
|
|
|
HEADERS += src/overlaycontroller.h \
|
|
src/tabcontrollers/AudioTabController.h \
|
|
src/tabcontrollers/ChaperoneTabController.h \
|
|
src/tabcontrollers/FixFloorTabController.h \
|
|
src/tabcontrollers/MoveCenterTabController.h \
|
|
src/tabcontrollers/SettingsTabController.h \
|
|
src/tabcontrollers/StatisticsTabController.h \
|
|
src/tabcontrollers/SteamVRTabController.h \
|
|
src/tabcontrollers/ReviveTabController.h \
|
|
src/tabcontrollers/UtilitiesTabController.h \
|
|
src/tabcontrollers/AudioManager.h \
|
|
src/tabcontrollers/PttController.h \
|
|
src/tabcontrollers/AccessibilityTabController.h \
|
|
src/tabcontrollers/KeyboardInput.h \
|
|
src/utils/Matrix.h \
|
|
src/utils/ChaperoneUtils.h \
|
|
src/tabcontrollers/audiomanager/AudioManagerDummy.h \
|
|
src/tabcontrollers/keyboardinput/KeyboardInputDummy.h \
|
|
src/overlaycontroller/openvr_init.h \
|
|
src/ivrinput/ivrinput_action.h \
|
|
src/ivrinput/ivrinput_manifest.h \
|
|
src/ivrinput/ivrinput_action_set.h \
|
|
src/ivrinput/ivrinput.h
|
|
|
|
win32 {
|
|
SOURCES += src/tabcontrollers/audiomanager/AudioManagerWindows.cpp \
|
|
src/tabcontrollers/keyboardinput/KeyboardInputWindows.cpp
|
|
HEADERS += src/tabcontrollers/audiomanager/AudioManagerWindows.h \
|
|
src/tabcontrollers/audiomanager/IPolicyConfig.h \
|
|
src/tabcontrollers/keyboardinput/KeyboardInputWindows.h
|
|
}
|
|
|
|
INCLUDEPATH += third-party/openvr/headers \
|
|
third-party/easylogging++
|
|
#easylogging++ used to be a header only lib. Now requires easylogging++.cc
|
|
SOURCES += third-party/easylogging++/easylogging++.cc
|
|
win32:LIBS += -L"$$PWD/third-party/openvr/lib/win64" -luser32 -lole32
|
|
unix:LIBS += -L"$$PWD/third-party/openvr/lib/linux64"
|
|
LIBS += -lopenvr_api
|
|
|
|
win32:DESTDIR = bin/win64/AdvancedSettings
|
|
unix:DESTDIR = bin/linux/AdvancedSettings
|
|
|
|
DISTFILES += \
|
|
src/res/sounds/alarm01.wav \
|
|
src/res/qml/ptt_notification.png \
|
|
src/res/battery_0.png \
|
|
src/res/battery_1.png \
|
|
src/res/battery_2.png \
|
|
src/res/battery_3.png \
|
|
src/res/battery_4.png \
|
|
src/res/battery_5.png \
|
|
src/res/thumbicon.png \
|
|
src/res/qml/backarrow.svg \
|
|
src/res/qml/check.svg \
|
|
src/res/qml/mic_off.svg \
|
|
src/res/qml/mic_on.svg \
|
|
src/res/qml/ptt_notification.svg \
|
|
src/res/qml/speaker_off.svg \
|
|
src/res/qml/speaker_on.svg \
|
|
src/res/qml/qmldir \
|
|
src/res/qml/AccessibilityPage.qml \
|
|
src/res/qml/audio_page/* \
|
|
src/res/qml/ChaperonePage.qml \
|
|
src/res/qml/ChaperoneWarningsPage.qml \
|
|
src/res/qml/FixFloorPage.qml \
|
|
src/res/qml/mainwidget.qml \
|
|
src/res/qml/MyComboBox.qml \
|
|
src/res/qml/MyDialogOkCancelPopup.qml \
|
|
src/res/qml/MyDialogOkPopup.qml \
|
|
src/res/qml/MyPushButton.qml \
|
|
src/res/qml/MyPushButton2.qml \
|
|
src/res/qml/MyResources.qml \
|
|
src/res/qml/MySlider.qml \
|
|
src/res/qml/MyStackViewPage.qml \
|
|
src/res/qml/MyText.qml \
|
|
src/res/qml/MyTextField.qml \
|
|
src/res/qml/MyToggleButton.qml \
|
|
src/res/qml/PlayspacePage.qml \
|
|
src/res/qml/PttControllerConfigDialog.qml \
|
|
src/res/qml/RevivePage.qml \
|
|
src/res/qml/RootPage.qml \
|
|
src/res/qml/SettingsPage.qml \
|
|
src/res/qml/StatisticsPage.qml \
|
|
src/res/qml/SteamVRPage.qml \
|
|
src/res/qml/utilities_page/* \
|
|
src/res/qml/utilities_page/media_keys/* \
|
|
src/res/qml/LineSeparator.qml \
|
|
src/res/qml/utilities_page/keyboard_utils/* \
|
|
src/res/qml/utilities_page/desktop_size/* \
|
|
src/res/qml/utilities_page/alarm_clock/* \
|
|
src/res/qml/audio_page/dialog_boxes/* \
|
|
src/res/qml/audio_page/device_selector/*
|
|
src/res/qml/audio_page/proximity/*
|
|
src/res/qml/audio_page/push_to_talk/*
|
|
src/res/qml/audio_page/profiles/*
|