diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/angle/src/common/common.pri | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/angle/src/common/common.pri')
| -rw-r--r-- | src/angle/src/common/common.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 43ac3ee8db..8baedc5e4c 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -51,7 +51,6 @@ static: DEFINES *= QT_OPENGL_ES_2_ANGLE_STATIC HEADERS += \ $$ANGLE_DIR/src/common/angleutils.h \ $$ANGLE_DIR/src/common/debug.h \ - $$ANGLE_DIR/src/common/event_tracer.h \ $$ANGLE_DIR/src/common/mathutil.h \ $$ANGLE_DIR/src/common/platform.h \ $$ANGLE_DIR/src/common/RefCountObject.h \ @@ -59,8 +58,8 @@ HEADERS += \ $$ANGLE_DIR/src/common/version.h SOURCES += \ + $$ANGLE_DIR/src/common/angleutils.cpp \ $$ANGLE_DIR/src/common/debug.cpp \ - $$ANGLE_DIR/src/common/event_tracer.cpp \ $$ANGLE_DIR/src/common/RefCountObject.cpp \ $$ANGLE_DIR/src/common/tls.cpp |