From 4df389eb4f1ae10284c03023e923ce2164d46753 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Thu, 17 Oct 2019 10:02:48 +0200
Subject: Re-generate affected cmake files and configure.json after the merge

This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.

Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/widgets/.prev_CMakeLists.txt | 29 +++++++++++++++--------------
 src/widgets/CMakeLists.txt       | 29 +++++++++++++++--------------
 2 files changed, 30 insertions(+), 28 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index 28d32a14b5..cdd9546eda 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -647,20 +647,21 @@ extend_target(Widgets CONDITION QT_FEATURE_messagebox
         dialogs/qmessagebox.cpp dialogs/qmessagebox.h
 )
 
-# Resources:
-set(qmessagebox_resource_files
-    "images/qtlogo-64.png"
-)
-
-add_qt_resource(Widgets "qmessagebox"
-    PREFIX
-        "/qt-project.org/qmessagebox"
-    BASE
-        "dialogs"
-    FILES
-        ${qmessagebox_resource_files}
-)
-
+if(QT_FEATURE_messagebox)
+    # Resources:
+    set(qmessagebox_resource_files
+        "images/qtlogo-64.png"
+    )
+    
+    add_qt_resource(Widgets "qmessagebox"
+        PREFIX
+            "/qt-project.org/qmessagebox"
+        BASE
+            "dialogs"
+        FILES
+            ${qmessagebox_resource_files}
+    )
+endif()
 
 extend_target(Widgets CONDITION QT_FEATURE_progressdialog
     SOURCES
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 4ca3a70241..4fb69ee475 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -651,20 +651,21 @@ extend_target(Widgets CONDITION QT_FEATURE_messagebox
         dialogs/qmessagebox.cpp dialogs/qmessagebox.h
 )
 
-# Resources:
-set(qmessagebox_resource_files
-    "images/qtlogo-64.png"
-)
-
-add_qt_resource(Widgets "qmessagebox"
-    PREFIX
-        "/qt-project.org/qmessagebox"
-    BASE
-        "dialogs"
-    FILES
-        ${qmessagebox_resource_files}
-)
-
+if(QT_FEATURE_messagebox)
+    # Resources:
+    set(qmessagebox_resource_files
+        "images/qtlogo-64.png"
+    )
+    
+    add_qt_resource(Widgets "qmessagebox"
+        PREFIX
+            "/qt-project.org/qmessagebox"
+        BASE
+            "dialogs"
+        FILES
+            ${qmessagebox_resource_files}
+    )
+endif()
 
 extend_target(Widgets CONDITION QT_FEATURE_progressdialog
     SOURCES
-- 
cgit v1.2.3