diff options
27 files changed, 149 insertions, 41 deletions
diff --git a/examples/corelib/ipc/sharedmemory/CMakeLists.txt b/examples/corelib/ipc/sharedmemory/CMakeLists.txt index 125cfbd243..a987433302 100644 --- a/examples/corelib/ipc/sharedmemory/CMakeLists.txt +++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt @@ -11,9 +11,11 @@ add_qt_executable(sharedmemory SOURCES dialog.cpp dialog.h dialog.ui main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) -#### Keys ignored in scope 1:.:sharedmemory.pro:<NONE>: +#### Keys ignored in scope 1:.:.:sharedmemory.pro:<TRUE>: # EXAMPLE_FILES = "*.png" diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index 68abe95da6..9f321bbce3 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -16,7 +16,9 @@ add_qt_executable(chat org.example.chat.xml DBUS_INTERFACE_SOURCES org.example.chat.xml - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index c9902e2519..3f360fa51b 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -13,7 +13,9 @@ add_qt_executable(controller main.cpp DBUS_INTERFACE_SOURCES car.xml - LIBRARIES + PUBLIC_LIBRARIES Qt::DBus Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index b7d8441b96..a4276bf2d8 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -11,9 +11,11 @@ add_qt_executable(flightinfo SOURCES flightinfo.cpp form.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -21,5 +23,5 @@ add_qt_resource(flightinfo "flightinfo" PREFIX "/" FILES aircraft.png) -#### Keys ignored in scope 1:.:flightinfo.pro:<NONE>: +#### Keys ignored in scope 1:.:.:flightinfo.pro:<TRUE>: # TEMPLATE = "app" diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index 9c82adc99d..d14acc8b5a 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -11,8 +11,10 @@ add_qt_executable(styleexample SOURCES main.cpp stylewidget.cpp stylewidget.h stylewidget.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/examples/network/bearermonitor/CMakeLists.txt b/examples/network/bearermonitor/CMakeLists.txt index 001e5c7e2e..83c45fb21a 100644 --- a/examples/network/bearermonitor/CMakeLists.txt +++ b/examples/network/bearermonitor/CMakeLists.txt @@ -13,19 +13,21 @@ add_qt_executable(bearermonitor bearermonitor_640_480.ui main.cpp sessionwidget.cpp sessionwidget.h sessionwidget.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Gui Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) -#### Keys ignored in scope 1:.:bearermonitor.pro:<NONE>: +#### Keys ignored in scope 1:.:.:bearermonitor.pro:<TRUE>: # CONFIG = "console" ## Scopes: ##################################################################### extend_target(bearermonitor CONDITION WIN32 - LIBRARIES + PUBLIC_LIBRARIES ws2_32 ) diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt index d1c61f1c98..30f6b900e2 100644 --- a/examples/network/http/CMakeLists.txt +++ b/examples/network/http/CMakeLists.txt @@ -12,7 +12,9 @@ add_qt_executable(http authenticationdialog.ui httpwindow.cpp httpwindow.h main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt index 56cd632529..d620d899d1 100644 --- a/examples/network/network-chat/CMakeLists.txt +++ b/examples/network/network-chat/CMakeLists.txt @@ -15,7 +15,9 @@ add_qt_executable(network-chat main.cpp peermanager.cpp peermanager.h server.cpp server.h - LIBRARIES + PUBLIC_LIBRARIES Qt::Network Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index e01adc1402..7a25b95cde 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -14,11 +14,12 @@ add_qt_executable(books initdb.h main.cpp INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_SOURCE_DIR} - LIBRARIES + . + PUBLIC_LIBRARIES Qt::Sql Qt::Widgets - Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -26,5 +27,5 @@ add_qt_resource(books "books" PREFIX "/" FILES images/star.png) -#### Keys ignored in scope 1:.:books.pro:<NONE>: +#### Keys ignored in scope 1:.:.:books.pro:<TRUE>: # TEMPLATE = "app" diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt index 03111e9049..a2e0ed951d 100644 --- a/examples/sql/sqlbrowser/CMakeLists.txt +++ b/examples/sql/sqlbrowser/CMakeLists.txt @@ -14,16 +14,18 @@ add_qt_executable(sqlbrowser connectionwidget.cpp connectionwidget.h main.cpp qsqlconnectiondialog.cpp qsqlconnectiondialog.h qsqlconnectiondialog.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Sql Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) -#### Keys ignored in scope 1:.:sqlbrowser.pro:<NONE>: +#### Keys ignored in scope 1:.:.:sqlbrowser.pro:<TRUE>: # TEMPLATE = "app" ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:sqlbrowser.pro:build_all AND NOT build_pass: +#### Keys ignored in scope 2:.:.:sqlbrowser.pro:build_all AND NOT build_pass: # CONFIG = "-build_all" "release" diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index ba391d082b..b7444412a6 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -13,8 +13,10 @@ add_qt_executable(easing form.ui main.cpp window.cpp window.h - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index d31e15102e..dda61e0f68 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt @@ -12,8 +12,10 @@ add_qt_executable(embeddeddialogs customproxy.cpp customproxy.h embeddeddialog.cpp embeddeddialog.h embeddeddialog.ui main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -24,5 +26,5 @@ add_qt_resource(embeddeddialogs "embeddeddialogs" FILES ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:embeddeddialogs.pro:build_all AND NOT build_pass: +#### Keys ignored in scope 2:.:.:embeddeddialogs.pro:build_all AND NOT build_pass: # CONFIG = "-build_all" "release" diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt index ad879d3a8b..9c4282391e 100644 --- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt +++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt @@ -14,8 +14,10 @@ add_qt_executable(padnavigator padnavigator.cpp padnavigator.h roundrectitem.cpp roundrectitem.h splashitem.cpp splashitem.h - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -31,13 +33,13 @@ add_qt_resource(padnavigator "padnavigator" FILES images/minitools.png) -#### Keys ignored in scope 1:.:padnavigator.pro:<NONE>: +#### Keys ignored in scope 1:.:.:padnavigator.pro:<TRUE>: # CONFIG = "console" ## Scopes: ##################################################################### extend_target(padnavigator CONDITION TARGET Qt::OpenGL - LIBRARIES + PUBLIC_LIBRARIES Qt::OpenGL ) diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index 699dfb1733..9cb49e0a25 100644 --- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt @@ -13,8 +13,10 @@ add_qt_executable(editabletreemodel mainwindow.cpp mainwindow.h mainwindow.ui treeitem.cpp treeitem.h treemodel.cpp treemodel.h - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt index a32b10589f..38bb59eb6c 100644 --- a/examples/widgets/painting/fontsampler/CMakeLists.txt +++ b/examples/widgets/painting/fontsampler/CMakeLists.txt @@ -12,14 +12,16 @@ add_qt_executable(fontsampler main.cpp mainwindow.cpp mainwindow.h mainwindowbase.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) ## Scopes: ##################################################################### extend_target(fontsampler CONDITION TARGET Qt::PrintSupport - LIBRARIES + PUBLIC_LIBRARIES Qt::PrintSupport ) diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index 751026bd62..f3f1a5a436 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -13,8 +13,10 @@ add_qt_executable(undo document.cpp document.h main.cpp mainwindow.cpp mainwindow.h mainwindow.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -40,5 +42,5 @@ add_qt_resource(undo "undo" PREFIX "/" FILES ## Scopes: ##################################################################### -#### Keys ignored in scope 2:.:undo.pro:build_all AND NOT build_pass: +#### Keys ignored in scope 2:.:.:undo.pro:build_all AND NOT build_pass: # CONFIG = "-build_all" "release" diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt index 0266bc4e3b..76920b0f3c 100644 --- a/examples/widgets/touch/dials/CMakeLists.txt +++ b/examples/widgets/touch/dials/CMakeLists.txt @@ -11,6 +11,8 @@ add_qt_executable(dials SOURCES dials.ui main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) 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 ) diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index dfb52a1a47..227eb13b68 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -12,8 +12,10 @@ add_qt_executable(stylesheet main.cpp mainwindow.cpp mainwindow.h mainwindow.ui stylesheeteditor.cpp stylesheeteditor.h stylesheeteditor.ui - LIBRARIES + PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index 9da1da775e..ef981d9eb7 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -16,6 +16,8 @@ add_qt_executable(validators validatorwidget.cpp validatorwidget.h PUBLIC_LIBRARIES Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index cae1e98111..bd1aad0406 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -235,8 +235,6 @@ add_qt_module(Core WrapDoubleConversion::WrapDoubleConversion # special case PUBLIC_LIBRARIES # special case: Qt::Platform # special case: - DISABLE_AUTOGEN_TOOLS # special case: - uic # special case: DISABLE_TOOLS_EXPORT # special case: ) diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index a689aa8d70..bdb93042d5 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -68,6 +68,8 @@ extend_target(PrintSupport CONDITION QT_FEATURE_cups AND UNIX AND NOT APPLE extend_target(PrintSupport CONDITION QT_FEATURE_cupsjobwidget AND UNIX AND NOT APPLE SOURCES widgets/qcupsjobwidget.cpp widgets/qcupsjobwidget.ui widgets/qcupsjobwidget_p.h + ENABLE_AUTOGEN_TOOLS + uic ) extend_target(PrintSupport CONDITION QT_FEATURE_printdialog @@ -76,6 +78,8 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog dialogs/qpagesetupdialog.cpp dialogs/qpagesetupdialog.h dialogs/qpagesetupdialog_p.h dialogs/qpagesetupwidget.ui dialogs/qprintdialog.h + ENABLE_AUTOGEN_TOOLS + uic ) # Resources: @@ -138,6 +142,8 @@ extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APP dialogs/qprintwidget.ui INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}/src/plugins/printsupport/cups + ENABLE_AUTOGEN_TOOLS + uic ) extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index e110049c1c..9e03052863 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -34,8 +34,6 @@ add_qt_tool(uic cpp # ${CMAKE_CURRENT_BINARY_DIR} # special case: remove python - DISABLE_AUTOGEN_TOOLS # special case: - uic rcc ) #### Keys ignored in scope 1:.:.:uic.pro:<TRUE>: diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 76b9022650..bd1f19fb0e 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -586,6 +586,8 @@ extend_target(Widgets CONDITION QT_FEATURE_filedialog SOURCES dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h dialogs/qsidebar.cpp dialogs/qsidebar_p.h + ENABLE_AUTOGEN_TOOLS + uic ) extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 83400dc82a..d946bc8e1d 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -590,6 +590,8 @@ extend_target(Widgets CONDITION QT_FEATURE_filedialog SOURCES dialogs/qfiledialog.cpp dialogs/qfiledialog.h dialogs/qfiledialog.ui dialogs/qfiledialog_p.h dialogs/qsidebar.cpp dialogs/qsidebar_p.h + ENABLE_AUTOGEN_TOOLS + uic ) extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index 6cfd4ab427..c879f7306e 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -1,10 +1,24 @@ -add_qt_test("tst_qgridlayout" +# Generated from qgridlayout.pro. + +##################################################################### +## tst_qgridlayout Test: +##################################################################### + +add_qt_test(tst_qgridlayout SOURCES sortdialog.ui tst_qgridlayout.cpp LIBRARIES - Qt::WidgetsPrivate Qt::CorePrivate Qt::GuiPrivate Qt::TestPrivate + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic ) + +#### Keys ignored in scope 1:.:.:qgridlayout.pro:<TRUE>: +# CONFIG = "testcase" |