29 files changed, 19 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb0c21a70..b42cd4946 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,6 +21,11 @@ qt_exclude_tool_directories_from_default_target(
 qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/../configure.cmake")
 # special case end
 
+if(TARGET Qt::Widgets)
+    add_subdirectory(uiplugin)
+    add_subdirectory(uitools)
+endif()
+
 add_subdirectory(global) # special case add as first directory
 if(QT_FEATURE_linguist)
     add_subdirectory(linguist)
diff --git a/src/designer/src/CMakeLists.txt b/src/designer/src/CMakeLists.txt
index 32fb45160..31fc1734e 100644
--- a/src/designer/src/CMakeLists.txt
+++ b/src/designer/src/CMakeLists.txt
@@ -8,8 +8,6 @@ qt_exclude_tool_directories_from_default_target(
     plugins
 )
 
-add_subdirectory(uiplugin)
-add_subdirectory(uitools)
 if(QT_FEATURE_process)
     add_subdirectory(lib)
     add_subdirectory(components)
diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index 964fb47ed..75c8c78dd 100644
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -28,11 +28,11 @@ qhp.QtDesigner.subprojects.classes.sortPages = true
 language                = Cpp
 
 headerdirs             += .. \
-                          ../../uiplugin \
+                          ../../../../uiplugin \
                           ../../lib
 
 sourcedirs              = .. \
-                          ../../uiplugin \
+                          ../../../../uiplugin \
                           ../../lib
 
 exampledirs             = ../../../../../examples/designer \
diff --git a/src/designer/src/uiplugin/CMakeLists.txt b/src/uiplugin/CMakeLists.txt
index 4fedf8e33..4fedf8e33 100644
--- a/src/designer/src/uiplugin/CMakeLists.txt
+++ b/src/uiplugin/CMakeLists.txt
diff --git a/src/designer/src/uiplugin/customwidget.h b/src/uiplugin/customwidget.h
index efb392009..efb392009 100644
--- a/src/designer/src/uiplugin/customwidget.h
+++ b/src/uiplugin/customwidget.h
diff --git a/src/designer/src/uiplugin/customwidget.qdoc b/src/uiplugin/customwidget.qdoc
index a63e0db7c..a63e0db7c 100644
--- a/src/designer/src/uiplugin/customwidget.qdoc
+++ b/src/uiplugin/customwidget.qdoc
diff --git a/src/designer/src/uiplugin/qdesignerexportwidget.h b/src/uiplugin/qdesignerexportwidget.h
index ea62450ff..ea62450ff 100644
--- a/src/designer/src/uiplugin/qdesignerexportwidget.h
+++ b/src/uiplugin/qdesignerexportwidget.h
diff --git a/src/designer/src/uitools/CMakeLists.txt b/src/uitools/CMakeLists.txt
index 5306fcbd5..448bd1840 100644
--- a/src/designer/src/uitools/CMakeLists.txt
+++ b/src/uitools/CMakeLists.txt
@@ -6,13 +6,13 @@
 
 qt_internal_add_module(UiTools
     SOURCES
-        ../lib/uilib/abstractformbuilder.cpp ../lib/uilib/abstractformbuilder.h
-        ../lib/uilib/formbuilder.cpp ../lib/uilib/formbuilder.h
-        ../lib/uilib/formbuilderextra.cpp ../lib/uilib/formbuilderextra_p.h
-        ../lib/uilib/properties.cpp ../lib/uilib/properties_p.h
-        ../lib/uilib/resourcebuilder.cpp ../lib/uilib/resourcebuilder_p.h
-        ../lib/uilib/textbuilder.cpp ../lib/uilib/textbuilder_p.h
-        ../lib/uilib/ui4.cpp ../lib/uilib/ui4_p.h
+        ../designer/src/lib/uilib/abstractformbuilder.cpp ../designer/src/lib/uilib/abstractformbuilder.h
+        ../designer/src/lib/uilib/formbuilder.cpp ../designer/src/lib/uilib/formbuilder.h
+        ../designer/src/lib/uilib/formbuilderextra.cpp ../designer/src/lib/uilib/formbuilderextra_p.h
+        ../designer/src/lib/uilib/properties.cpp ../designer/src/lib/uilib/properties_p.h
+        ../designer/src/lib/uilib/resourcebuilder.cpp ../designer/src/lib/uilib/resourcebuilder_p.h
+        ../designer/src/lib/uilib/textbuilder.cpp ../designer/src/lib/uilib/textbuilder_p.h
+        ../designer/src/lib/uilib/ui4.cpp ../designer/src/lib/uilib/ui4_p.h
         quiloader.cpp quiloader.h
     DEFINES
         QFORMINTERNAL_NAMESPACE
@@ -20,7 +20,7 @@ qt_internal_add_module(UiTools
         QT_DESIGNER_STATIC
         QT_USE_QSTRINGBUILDER
     INCLUDE_DIRECTORIES
-        ../lib/uilib
+        ../designer/src/lib/uilib
     LIBRARIES
         Qt::UiPlugin
     PUBLIC_LIBRARIES
@@ -37,7 +37,7 @@ qt_internal_extend_target(UiTools CONDITION TARGET Qt::OpenGLWidgets
         Qt::OpenGLWidgets
 )
 
-qt_internal_extend_target(UiTools CONDITION QT_FEATURE_opengl
+qt_internal_extend_target(UiTools CONDITION TARGET Qt::OpenGL
     LIBRARIES
         Qt::OpenGL
 )
diff --git a/src/designer/src/uitools/doc/images/textfinder-example-find.png b/src/uitools/doc/images/textfinder-example-find.png
index 886bbc110..886bbc110 100644
--- a/src/designer/src/uitools/doc/images/textfinder-example-find.png
+++ b/src/uitools/doc/images/textfinder-example-find.png
diff --git a/src/designer/src/uitools/doc/images/textfinder-example-find2.png b/src/uitools/doc/images/textfinder-example-find2.png
index 908f11409..908f11409 100644
--- a/src/designer/src/uitools/doc/images/textfinder-example-find2.png
+++ b/src/uitools/doc/images/textfinder-example-find2.png
diff --git a/src/designer/src/uitools/doc/images/textfinder-example.png b/src/uitools/doc/images/textfinder-example.png
index 87322df98..87322df98 100644
--- a/src/designer/src/uitools/doc/images/textfinder-example.png
+++ b/src/uitools/doc/images/textfinder-example.png
diff --git a/src/designer/src/uitools/doc/images/uitools-examples.png b/src/uitools/doc/images/uitools-examples.png
index 8c85cdb76..8c85cdb76 100644
--- a/src/designer/src/uitools/doc/images/uitools-examples.png
+++ b/src/uitools/doc/images/uitools-examples.png
diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/uitools/doc/qtuitools.qdocconf
index 136573ba1..3b0baaa60 100644
--- a/src/designer/src/uitools/doc/qtuitools.qdocconf
+++ b/src/uitools/doc/qtuitools.qdocconf
@@ -27,7 +27,7 @@ headerdirs            += ..
 
 sourcedirs              = ..
 
-exampledirs             = ../../../../../examples/uitools \
+exampledirs             = ../../../examples/uitools \
                           snippets
 
 imagedirs               = images
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.cpp b/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.cpp
index 74d4ef622..74d4ef622 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.cpp
+++ b/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.cpp
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.pro b/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.pro
index f0ee13a10..f0ee13a10 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.pro
+++ b/src/uitools/doc/snippets/quiloader/doc_src_qtuiloader.pro
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/main.cpp b/src/uitools/doc/snippets/quiloader/main.cpp
index 73b66a891..73b66a891 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/main.cpp
+++ b/src/uitools/doc/snippets/quiloader/main.cpp
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/myform.ui b/src/uitools/doc/snippets/quiloader/myform.ui
index 00702e860..00702e860 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/myform.ui
+++ b/src/uitools/doc/snippets/quiloader/myform.ui
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.cpp b/src/uitools/doc/snippets/quiloader/mywidget.cpp
index f03fabd77..f03fabd77 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.cpp
+++ b/src/uitools/doc/snippets/quiloader/mywidget.cpp
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.h b/src/uitools/doc/snippets/quiloader/mywidget.h
index 4bcfe5dea..4bcfe5dea 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.h
+++ b/src/uitools/doc/snippets/quiloader/mywidget.h
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.qrc b/src/uitools/doc/snippets/quiloader/mywidget.qrc
index 47684d68b..47684d68b 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/mywidget.qrc
+++ b/src/uitools/doc/snippets/quiloader/mywidget.qrc
diff --git a/src/designer/src/uitools/doc/snippets/quiloader/quiloader.pro b/src/uitools/doc/snippets/quiloader/quiloader.pro
index 31ddf3256..31ddf3256 100644
--- a/src/designer/src/uitools/doc/snippets/quiloader/quiloader.pro
+++ b/src/uitools/doc/snippets/quiloader/quiloader.pro
diff --git a/src/designer/src/uitools/doc/src/qtuitools-examples.qdoc b/src/uitools/doc/src/qtuitools-examples.qdoc
index f1e1dae53..f1e1dae53 100644
--- a/src/designer/src/uitools/doc/src/qtuitools-examples.qdoc
+++ b/src/uitools/doc/src/qtuitools-examples.qdoc
diff --git a/src/designer/src/uitools/doc/src/qtuitools-index.qdoc b/src/uitools/doc/src/qtuitools-index.qdoc
index a63de0e50..a63de0e50 100644
--- a/src/designer/src/uitools/doc/src/qtuitools-index.qdoc
+++ b/src/uitools/doc/src/qtuitools-index.qdoc
diff --git a/src/designer/src/uitools/doc/src/qtuitools-module.qdoc b/src/uitools/doc/src/qtuitools-module.qdoc
index b65bd918e..b65bd918e 100644
--- a/src/designer/src/uitools/doc/src/qtuitools-module.qdoc
+++ b/src/uitools/doc/src/qtuitools-module.qdoc
diff --git a/src/designer/src/uitools/qtuitoolsglobal.h b/src/uitools/qtuitoolsglobal.h
index 40827b3ab..40827b3ab 100644
--- a/src/designer/src/uitools/qtuitoolsglobal.h
+++ b/src/uitools/qtuitoolsglobal.h
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index e0ba98a1e..e0ba98a1e 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
diff --git a/src/designer/src/uitools/quiloader.h b/src/uitools/quiloader.h
index 7d632ab0b..7d632ab0b 100644
--- a/src/designer/src/uitools/quiloader.h
+++ b/src/uitools/quiloader.h
diff --git a/src/designer/src/uitools/quiloader_p.h b/src/uitools/quiloader_p.h
index 0febc88c2..0febc88c2 100644
--- a/src/designer/src/uitools/quiloader_p.h
+++ b/src/uitools/quiloader_p.h
diff --git a/sync.profile b/sync.profile
index de4261afc..caa7ed5ad 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,8 +1,8 @@
 %modules = ( # path to module name map
     "QtTools" => "$basedir/src/global",
     "QtHelp" => "$basedir/src/assistant/help",
-    "QtUiTools" => "$basedir/src/designer/src/uitools",
-    "QtUiPlugin" => "$basedir/src/designer/src/uiplugin",
+    "QtUiTools" => "$basedir/src/uitools",
+    "QtUiPlugin" => "$basedir/src/uiplugin",
     "QtDesigner" => "$basedir/src/designer/src/lib",
     "QtDesignerComponents" => "$basedir/src/designer/src/components/lib",
 );