DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -55,40 +55,41 @@ · 54 unmodified lines | ||
| 55 | 55 | #include <QMessageBox> |
| 56 | 56 | #include <QJsonDocument> |
| 57 | 57 | |
| 58 | −#include <AddressManager.h> | |
| 59 | 58 | #include <AccountManager.h> |
| 59 | +#include <AddressManager.h> | |
| 60 | 60 | #include <AmbientOcclusionEffect.h> |
| 61 | 61 | #include <AudioInjector.h> |
| 62 | 62 | #include <DeferredLightingEffect.h> |
| 63 | 63 | #include <DependencyManager.h> |
| 64 | 64 | #include <EntityScriptingInterface.h> |
| 65 | +#include <ErrorDialog.h> | |
| 65 | 66 | #include <GlowEffect.h> |
| 66 | 67 | #include <HFActionEvent.h> |
| 67 | 68 | #include <HFBackEvent.h> |
| 68 | −#include <VrMenu.h> | |
| 69 | +#include <InfoView.h> | |
| 69 | 70 | #include <LogHandler.h> |
| 70 | 71 | #include <MainWindow.h> |
| 72 | +#include <MessageDialog.h> | |
| 71 | 73 | #include <ModelEntityItem.h> |
| 72 | 74 | #include <NetworkAccessManager.h> |
| 73 | 75 | #include <NetworkingConstants.h> |
| 76 | +#include <ObjectMotionState.h> | |
| 74 | 77 | #include <OctalCode.h> |
| 75 | 78 | #include <OctreeSceneStats.h> |
| 76 | −#include <ObjectMotionState.h> | |
| 77 | 79 | #include <PacketHeaders.h> |
| 78 | 80 | #include <PathUtils.h> |
| 79 | 81 | #include <PerfStat.h> |
| 80 | 82 | #include <PhysicsEngine.h> |
| 81 | 83 | #include <ProgramObject.h> |
| 82 | 84 | #include <ResourceCache.h> |
| 85 | +#include <SceneScriptingInterface.h> | |
| 83 | 86 | #include <ScriptCache.h> |
| 84 | 87 | #include <SettingHandle.h> |
| 85 | 88 | #include <SoundCache.h> |
| 86 | 89 | #include <TextRenderer.h> |
| 87 | 90 | #include <UserActivityLogger.h> |
| 88 | 91 | #include <UUID.h> |
| 89 | −#include <MessageDialog.h> | |
| 90 | −#include <InfoView.h> | |
| 91 | −#include <SceneScriptingInterface.h> | |
| 92 | +#include <VrMenu.h> | |
| 92 | 93 | |
| 93 | 94 | #include "Application.h" |
| 94 | 95 | #include "AudioClient.h" |
| @@ -799,6 +800,7 @@ void Application::initializeGL() { · 704 unmodified lines | ||
| 799 | 800 | |
| 800 | 801 | void Application::initializeUi() { |
| 801 | 802 | AddressBarDialog::registerType(); |
| 803 | + ErrorDialog::registerType(); | |
| 802 | 804 | LoginDialog::registerType(); |
| 803 | 805 | MessageDialog::registerType(); |
| 804 | 806 | VrMenu::registerType(); |