Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-03-23 08:26:15 +0300
committerDavide Beatrici <davidebeatrici@gmail.com>2019-09-12 01:13:35 +0300
commit5a07244a449592a143a628fde9b84846ee82e0ff (patch)
tree28d4f105d26c4bf86c89b2e98452b5fb77621013 /src/tests
parent713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff)
Don't include PCH headers directly
According to Qt's documentation the PCH header doesn't need to be included. From https://doc.qt.io/qt-5/qmake-precompiledheaders.html: "To make your project use precompiled headers, you only need to define the PRECOMPILED_HEADER variable in your project file." "qmake will handle the rest, to ensure the creation and use of the precompiled header file. You do not need to include the precompiled header file in HEADERS, as qmake will do this if the configuration supports precompiled headers."
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/TestCrypt/TestCrypt.cpp3
-rw-r--r--src/tests/test.pri9
2 files changed, 0 insertions, 12 deletions
diff --git a/src/tests/TestCrypt/TestCrypt.cpp b/src/tests/TestCrypt/TestCrypt.cpp
index 61179fc9d..2b67db93e 100644
--- a/src/tests/TestCrypt/TestCrypt.cpp
+++ b/src/tests/TestCrypt/TestCrypt.cpp
@@ -3,9 +3,6 @@
// that can be found in the LICENSE file at the root of the
// Mumble source tree or at <https://www.mumble.info/LICENSE>.
-// Include murmur_pch.h for STACKVAR
-#include "murmur_pch.h"
-
#include <QtCore>
#include <QtTest>
diff --git a/src/tests/test.pri b/src/tests/test.pri
index 22b2747b6..f3b622e80 100644
--- a/src/tests/test.pri
+++ b/src/tests/test.pri
@@ -13,15 +13,6 @@ CONFIG += testcase
CONFIG += thread warn_on
CONFIG -= app_bundle
-# We build this test without 'gui' in QT,
-# but we include the QtGui headers from
-# murmur_pch.h. This causes an error when Qt
-# tries to find the OpenGL headers to use, since
-# we're missing the include paths from QtGui's
-# .pri files. Define QT_NO_OPENGL to avoid these
-# build errors.
-DEFINES += QT_NO_OPENGL
-
LANGUAGE = C++
VPATH *= ../.. ../../murmur ../../mumble