From e9c45bbdddd4df005bdaa5eea9740d351e6eaea2 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Wed, 24 Oct 2018 15:20:27 +0200
Subject: Begin port of qtbase to CMake
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Done-by: Alexandru Croitor <alexandru.croitor@qt.io>
Done-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Done-by: Kevin Funk <kevin.funk@kdab.com>
Done-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Done-by: Simon Hausmann <simon.hausmann@qt.io>
Done-by: Tobias Hunger <tobias.hunger@qt.io>
Done-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-by: Volker Krause <volker.krause@kdab.com>
Change-Id: Ida4f8bd190f9a4849a1af7b5b7981337a5df5310
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
---
 configure.json | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 3702c24f63..5201fd5ce9 100644
--- a/configure.json
+++ b/configure.json
@@ -1249,9 +1249,7 @@
         {
             "type": "warning",
             "condition": "input.debug_and_release == 'yes' && !config.darwin && !config.win32",
-            "message": "-debug-and-release is only supported on Darwin and Windows platforms.
-Qt can be built in release mode with separate debug information, so
--debug-and-release is no longer necessary."
+            "message": "-debug-and-release is only supported on Darwin and Windows platforms.  Qt can be built in release mode with separate debug information, so -debug-and-release is no longer necessary."
         },
         {
             "type": "error",
@@ -1274,9 +1272,7 @@ Qt can be built in release mode with separate debug information, so
         {
             "type": "note",
             "condition": "!features.shared",
-            "message": "Using static linking will disable the use of dynamically
-loaded plugins. Make sure to import all needed static plugins,
-or compile needed modules into the library."
+            "message": "Using static linking will disable the use of dynamically loaded plugins. Make sure to import all needed static plugins, or compile needed modules into the library."
         },
         {
             "type": "note",
@@ -1286,8 +1282,7 @@ or compile needed modules into the library."
         {
             "type": "note",
             "condition": "input.qreal == 'double' && arch.arm",
-            "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1.
-Configure with '-qreal float' to create a build that is binary-compatible with 5.1."
+            "message": "Qt is using double for qreal on this system. This is binary-incompatible against Qt 5.1.  Configure with '-qreal float' to create a build that is binary-compatible with 5.1."
         },
         {
             "type": "error",
-- 
cgit v1.2.3