History

Merge pull request #5012 from ctrlaltdavid/20555

DO NOT MERGE - QA for #20555 - Re-style QML Address Bar

Stephen Birarda committed 11 years ago

Commit 12bcbbf2 parents 293af42 7d1248215 files · +523 −118Browse files

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

Unified · Split

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