Qt6 (#669)
* update qt6 upgrade progress * add flawed addition for QRenderTarget and link needed libs * update to better logging format * move many assets and qml files into qrc * get rid of deprecation messages * remove additional deprecation notices * make Qt6 finally render on desktop with some progress on vr * initialize QRhi with QQuickRenderControl * use default values to stop SegFaults * fix compilation on windows * add windows files for aiding in running exe * fix formatting of testing qt.conf * first attempt on using textures instead of files in AudioTabController * Fix public/private access issue --------- Co-authored-by: RTUnreal <unreal@rtinf.net>
This commit is contained in:
@@ -1,5 +1,8 @@
|
||||
#include "input_parser.h"
|
||||
|
||||
#include <QtLogging>
|
||||
#include <QtDebug>
|
||||
|
||||
std::optional<Token> getModifier( const char& character ) noexcept
|
||||
{
|
||||
switch ( character )
|
||||
@@ -50,7 +53,7 @@ std::optional<Token> getFunctionNumber( const char& character ) noexcept
|
||||
return Token::KEY_F9;
|
||||
|
||||
default:
|
||||
LOG( INFO ) << "Unknown function key number: " << character;
|
||||
qInfo() << "Unknown function key number: " << character;
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
@@ -80,7 +83,7 @@ std::optional<Token> getFunctionNumberExtended( const char& character ) noexcept
|
||||
case '9':
|
||||
return Token::KEY_F19;
|
||||
default:
|
||||
LOG( INFO ) << "Unknown function key number: " << character;
|
||||
qInfo() << "Unknown function key number: " << character;
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
@@ -210,7 +213,7 @@ std::vector<Token>
|
||||
|
||||
if ( !isupper( *ch ) || isspace( *ch ) )
|
||||
{
|
||||
LOG( INFO ) << "Unknown character found in sequence: " << *ch;
|
||||
qInfo() << "Unknown character found in sequence: " << *ch;
|
||||
continue;
|
||||
}
|
||||
// Everything below is upper case
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <vector>
|
||||
#include <cctype>
|
||||
#include <optional>
|
||||
#include <easylogging++.h>
|
||||
|
||||
enum class Token
|
||||
{
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
#include "input_parser.h"
|
||||
#include <easylogging++.h>
|
||||
|
||||
enum class KeyStatus
|
||||
{
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
#include <vector>
|
||||
#include <Windows.h>
|
||||
#include <cctype>
|
||||
#include <QtLogging>
|
||||
#include <QtDebug>
|
||||
|
||||
WORD convertToVirtualKeycode( const Token token )
|
||||
{
|
||||
@@ -183,13 +185,13 @@ void sendKeyboardInputRaw( std::vector<INPUT> inputs )
|
||||
0,
|
||||
nullptr ) )
|
||||
{
|
||||
LOG( ERROR )
|
||||
qCritical()
|
||||
<< "Error calling SendInput(): Could not get error message ("
|
||||
<< errCode << ")";
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG( ERROR ) << "Error calling SendInput(): " << err;
|
||||
qCritical() << "Error calling SendInput(): " << err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user