Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 07:23:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rm debugging

Browse source
This commit is contained in:
Zach Pomerantz 2017-06-13 18:16:16 -04:00
parent 0e2976620d
commit b24681125d
5 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -809,7 +809,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateThreadPoolCount); connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateThreadPoolCount);
connect(this, &Application::activeDisplayPluginChanged, this, [](){ connect(this, &Application::activeDisplayPluginChanged, this, [](){
bool isHMD = qApp->isHMDMode();
qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode()); qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode());
}); });
connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode); connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode);

2
interface/src/InterfaceLogging.cpp
View file

@ -11,6 +11,6 @@
#include "InterfaceLogging.h" #include "InterfaceLogging.h"
Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface", QtFatalMsg) Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface")
Q_LOGGING_CATEGORY(interfaceapp_timing, "hifi.interface.timing") Q_LOGGING_CATEGORY(interfaceapp_timing, "hifi.interface.timing")
Q_LOGGING_CATEGORY(interfaceapp_deadlock, "hifi.interface.deadlock") Q_LOGGING_CATEGORY(interfaceapp_deadlock, "hifi.interface.deadlock")

2
interface/src/Menu.cpp
View file

@ -287,7 +287,7 @@ Menu::Menu() {
QString("../../hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); QString("../../hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");
}); });
action = addActionToQMenuAndActionHash(settingsMenu, "Audio...", Qt::CTRL | Qt::Key_Z); action = addActionToQMenuAndActionHash(settingsMenu, "Audio...");
connect(action, &QAction::triggered, [] { connect(action, &QAction::triggered, [] {
static const QUrl widgetUrl("hifi/dialogs/Audio.qml"); static const QUrl widgetUrl("hifi/dialogs/Audio.qml");
static const QUrl tabletUrl("../../hifi/audio/Audio.qml"); static const QUrl tabletUrl("../../hifi/audio/Audio.qml");

2
interface/src/ui/AvatarInputs.h
View file

@ -49,7 +49,7 @@ signals:
void audioClippingChanged(); void audioClippingChanged();
void audioLevelChanged(); void audioLevelChanged();
void isHMDChanged(); void isHMDChanged();
void showAudioToolsChanged(bool); void showAudioToolsChanged(bool show);
protected: protected:
Q_INVOKABLE void resetSensors(); Q_INVOKABLE void resetSensors();

2
libraries/networking/src/NetworkLogging.cpp
View file

@ -11,7 +11,7 @@
#include "NetworkLogging.h" #include "NetworkLogging.h"
Q_LOGGING_CATEGORY(networking, "hifi.networking", QtFatalMsg) Q_LOGGING_CATEGORY(networking, "hifi.networking")
Q_LOGGING_CATEGORY(resourceLog, "hifi.networking.resource") Q_LOGGING_CATEGORY(resourceLog, "hifi.networking.resource")
Q_LOGGING_CATEGORY(asset_client, "hifi.networking.asset_client") Q_LOGGING_CATEGORY(asset_client, "hifi.networking.asset_client")
Q_LOGGING_CATEGORY(messages_client, "hifi.networking.messages_client") Q_LOGGING_CATEGORY(messages_client, "hifi.networking.messages_client")