1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From 6f4746e59c3768a56336f202054ec5498a7d376f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
Date: Wed, 14 Sep 2016 23:51:14 +0200
Subject: [PATCH] Remove unused check for the private_headers
TL;DR: it is useless and it breaks the build -> remove
The configuration system in qtbase got changed during the 5.8
development, and as a result, this won't build anymore. It seems that
the new syntax is `contains(QT_CONFIG, private_tests)`, but it turns out
that qt_developer_build is never used anyway.
I did some git archeology and it looks like it was nuked when doing the
5.2 merge from upstream. The original purpose was apparently to control
-Werror, which is nowadays controlled by CONFIG -= production_build.
Task-number: QTBUG-55950
Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
---
Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index 6bb52d0..8aa806d 100644
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
scratchbox: PYTHON = python2.6
else: PYTHON = python
-# We use private_tests to detect developer build, since the destdir will
-# always be our webkit build dir. This might change as configure changes.
-qtConfig(private_tests): CONFIG += qt_developer_build
-
# By default we enable "production build", and build-webkit, which is
# used by bots and developers, will disable it, to enable warnings etc.
CONFIG += production_build
|