From 3b673994ea0311616db7022cef859705e25cdfab Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 18 Mar 2020 14:35:40 +0100
Subject: CMake: Regenerate projects after merge

Plus additional adjustments.

Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/designer/src/designer/CMakeLists.txt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/designer/src/designer/CMakeLists.txt')

diff --git a/src/designer/src/designer/CMakeLists.txt b/src/designer/src/designer/CMakeLists.txt
index 2731cfa2d..be0ea16f1 100644
--- a/src/designer/src/designer/CMakeLists.txt
+++ b/src/designer/src/designer/CMakeLists.txt
@@ -33,13 +33,10 @@ qt_add_executable(designer
         ../lib/sdk
         ../lib/shared
         extra
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::DesignerComponentsPrivate
         Qt::DesignerPrivate
-    PUBLIC_LIBRARIES
-        Qt::Designer
-        Qt::DesignerComponents
         Qt::Gui
         Qt::Network
         Qt::Widgets
@@ -128,7 +125,7 @@ qt_extend_target(designer CONDITION QT_CONFIG___contains___static
 # QMAKE_BUNDLE_DATA = "FILETYPES"
 # QMAKE_INFO_PLIST = "Info_mac.plist"
 
-qt_extend_target(designer CONDITION UNIX AND NOT APPLE_OSX AND NOT HAIKU
+qt_extend_target(designer CONDITION UNIX AND NOT HAIKU AND NOT MACOS
     PUBLIC_LIBRARIES
         m
 )
-- 
cgit v1.2.3