History

resolve conflicts on merge with upstream/master

Stephen Birarda committed 11 years ago

Commit fa0abe22 parents a9a1947 08986dc19 files · +675 −84Browse files

Showing the changes to interface/src/Application.cpp (1 of 19 files). Show all

Unified · Split

interface/src/Application.cpp+2−0
@@ -5067,5 +5067,7 @@ void Application::emulateMouse(Hand* hand, float click, float shift, int index) · 5066 unmodified lines
5067void Application::crashApplication() {5067void Application::crashApplication() {
5068 QObject* object = nullptr;5068 QObject* object = nullptr;
5069 bool value = object->isWindowType();5069 bool value = object->isWindowType();
5070 Q_UNUSED(value);
5071
5070 qCDebug(interfaceapp) << "Intentionally crashed Interface";5072 qCDebug(interfaceapp) << "Intentionally crashed Interface";
5071}5073}