From fa21d29b7506e21db8a433e117aebb9f3c724f03 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 22 May 2019 16:23:24 +0200
Subject: Rerun pro2cmake on projects that use .ui files

Task-number: QTBUG-75875
Change-Id: I95109b07fc4a6e09fe7911a21fc5f27f2c895d77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
---
 .../widgets/tutorials/notepad/.prev_CMakeLists.txt | 49 ++++++++++++++++++++++
 examples/widgets/tutorials/notepad/CMakeLists.txt  |  8 ++--
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 examples/widgets/tutorials/notepad/.prev_CMakeLists.txt

(limited to 'examples/widgets/tutorials')

diff --git a/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6634c8c148
--- /dev/null
+++ b/examples/widgets/tutorials/notepad/.prev_CMakeLists.txt
@@ -0,0 +1,49 @@
+# Generated from notepad.pro.
+
+#####################################################################
+## notepad Binary:
+#####################################################################
+
+add_qt_executable(notepad
+    GUI
+    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/widgets/tutorials/notepad"
+    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/widgets/tutorials/notepad"
+    SOURCES
+        main.cpp
+        notepad.cpp notepad.h notepad.ui
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+add_qt_resource(notepad "notepad" PREFIX "/" FILES
+    images/bold.png
+    images/copy.png
+    images/create.png
+    images/cut.png
+    images/edit_redo.png
+    images/edit_undo.png
+    images/exit.png
+    images/font.png
+    images/info.png
+    images/italic.png
+    images/new.png
+    images/open.png
+    images/paste.png
+    images/pencil.png
+    images/print.png
+    images/save.png
+    images/save_as.png
+    images/underline.png)
+
+
+#### Keys ignored in scope 1:.:.:notepad.pro:<TRUE>:
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(notepad CONDITION TARGET Qt::PrintSupport
+    PUBLIC_LIBRARIES
+        Qt::PrintSupport
+)
diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt
index 9dcf98fe4c..d34d3ca846 100644
--- a/examples/widgets/tutorials/notepad/CMakeLists.txt
+++ b/examples/widgets/tutorials/notepad/CMakeLists.txt
@@ -11,8 +11,10 @@ add_qt_executable(notepad
     SOURCES
         main.cpp
         notepad.cpp notepad.h notepad.ui
+    ENABLE_AUTOGEN_TOOLS
+        uic
     LIBRARIES # special case
-        Qt::Widgets
+        Qt::Widgets # special case
 )
 
 # Resources:
@@ -37,13 +39,13 @@ add_qt_resource(notepad "notepad" PREFIX "/" FILES
     images/underline.png)
 
 
-#### Keys ignored in scope 1:.:notepad.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:notepad.pro:<TRUE>:
 # TEMPLATE = "app"
 
 ## Scopes:
 #####################################################################
 
 extend_target(notepad CONDITION TARGET Qt::PrintSupport
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::PrintSupport
 )
-- 
cgit v1.2.3