mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 14:03:55 +02:00
make sure InterfaceConfig is included before Qt headers
This commit is contained in:
parent
8cbdf5d94a
commit
7ef882c525
5 changed files with 8 additions and 6 deletions
|
@ -5,6 +5,8 @@
|
|||
// Created by Andrzej Kapolka on 5/6/13.
|
||||
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
|
||||
|
||||
#include "Environment.h"
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QMutexLocker>
|
||||
#include <QtDebug>
|
||||
|
@ -15,7 +17,6 @@
|
|||
|
||||
#include "Application.h"
|
||||
#include "Camera.h"
|
||||
#include "Environment.h"
|
||||
#include "renderer/ProgramObject.h"
|
||||
#include "world.h"
|
||||
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#include "ImportDialog.h"
|
||||
|
||||
#include <QStandardPaths>
|
||||
#include <QGridLayout>
|
||||
#include <QSplitter>
|
||||
|
@ -14,7 +16,6 @@
|
|||
#include <QJsonObject>
|
||||
|
||||
#include "Application.h"
|
||||
#include "ImportDialog.h"
|
||||
|
||||
const QString WINDOW_NAME = QObject::tr("Import Voxels");
|
||||
const QString IMPORT_BUTTON_NAME = QObject::tr("Import Voxels");
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
#ifndef __interface__AmbientOcclusionEffect__
|
||||
#define __interface__AmbientOcclusionEffect__
|
||||
|
||||
#include "InterfaceConfig.h"
|
||||
|
||||
class ProgramObject;
|
||||
|
||||
/// A screen space ambient occlusion effect. See John Chapman's tutorial at
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#include "ui/LogDialog.h"
|
||||
|
||||
#include <QDesktopWidget>
|
||||
#include <QTextBlock>
|
||||
#include <QtGui>
|
||||
|
@ -13,7 +15,6 @@
|
|||
#include <SharedUtil.h>
|
||||
|
||||
#include "Application.h"
|
||||
#include "ui/LogDialog.h"
|
||||
|
||||
const int TOP_BAR_HEIGHT = 46;
|
||||
const int INITIAL_WIDTH = 720;
|
||||
|
|
|
@ -5,12 +5,13 @@
|
|||
// Created by stojce on 23.10.2013.
|
||||
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
|
||||
|
||||
#include "RearMirrorTools.h"
|
||||
|
||||
#include <QMouseEvent>
|
||||
|
||||
#include <SharedUtil.h>
|
||||
|
||||
#include "Application.h"
|
||||
#include "RearMirrorTools.h"
|
||||
#include "Util.h"
|
||||
|
||||
const char SETTINGS_GROUP_NAME[] = "Rear View Tools";
|
||||
|
|
Loading…
Reference in a new issue