10 files changed, 11 insertions, 59 deletions
diff --git a/Repository.mk b/Repository.mk
index 117f4c75a54c..a07f75841e6d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -486,7 +486,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 	testtools_cppobj \
 	testtools_bridgetest \
 	testtools_constructors \
-	uitest \
 	unobootstrapprotector \
 	unoexceptionprotector \
 	unotest \
diff --git a/include/test/testdllapi.hxx b/include/test/testdllapi.hxx
index b7af82c72e4e..3e33b0b51ec0 100644
--- a/include/test/testdllapi.hxx
+++ b/include/test/testdllapi.hxx
@@ -28,12 +28,6 @@
 #define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_IMPORT
 #endif
 
-#if defined DLLIMPLEMENTATION_UITEST
-#define UITEST_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define UITEST_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/dllapi.h b/include/vcl/dllapi.h
index bc9a522db620..0187fa04d115 100644
--- a/include/vcl/dllapi.h
+++ b/include/vcl/dllapi.h
@@ -29,6 +29,12 @@
 #define VCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
+#if defined DLLIMPLEMENTATION_UITEST
+#define UITEST_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define UITEST_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
 #if defined UNX && ! defined MACOS
 #define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC
 #else
diff --git a/include/test/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index c33bd4380790..a7c8b813a108 100644
--- a/include/test/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -12,7 +12,7 @@
 #include <memory>
 
 #include <vcl/window.hxx>
-#include <test/testdllapi.hxx>
+#include <vcl/dllapi.h>
 
 enum class UIObjectType
 {
diff --git a/include/test/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 2fb08f5ff6a2..3262aa953d63 100644
--- a/include/test/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -7,12 +7,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/testdllapi.hxx>
+#include <vcl/dllapi.h>
 
 class UITEST_DLLPUBLIC UITest
 {
 public:
 };
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/Library_uitest.mk b/test/Library_uitest.mk
deleted file mode 100644
index 83c15520470d..000000000000
--- a/test/Library_uitest.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,uitest))
-
-$(eval $(call gb_Library_add_defs,uitest,\
-    -DDLLIMPLEMENTATION_UITEST \
-))
-
-$(eval $(call gb_Library_use_sdk_api,uitest))
-
-$(eval $(call gb_Library_use_externals,uitest,\
-    boost_headers \
-    cppunit \
-    libxml2 \
-))
-
-$(eval $(call gb_Library_use_libraries,uitest,\
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    drawinglayer \
-    i18nlangtag \
-    sal \
-    svt \
-    tl \
-    unotest \
-    utl \
-    vcl \
-    $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,uitest,\
-    test/source/uitest/uitest \
-    test/source/uitest/uiobject \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/test/Module_test.mk b/test/Module_test.mk
index c43a11fdf2d9..7482d280e94e 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -14,7 +14,6 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_subsequenttest \
-    Library_uitest \
     Library_vclbootstrapprotector \
     Package_unittest \
 ))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 40dd0cdbfcdf..589b10ddfb9f 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_set_include,vcl,\
 
 $(eval $(call gb_Library_add_defs,vcl,\
     -DVCL_DLLIMPLEMENTATION \
+    -DDLLIMPLEMENTATION_UITEST \
 	-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \
 	-DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \
 	-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \
diff --git a/test/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index f1b0244d9725..b9a8db8a88c6 100644
--- a/test/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/uiobject.hxx>
+#include <vcl/uitest/uiobject.hxx>
 
 #include <iostream>
 
@@ -39,7 +39,6 @@ std::unique_ptr<UIObject> UIObject::get_child(const OUString&)
     return std::unique_ptr<UIObject>();
 }
 
-
 WindowUIObject::WindowUIObject(VclPtr<vcl::Window> xWindow):
     mxWindow(xWindow)
 {
diff --git a/test/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 92c2f135f47d..6d8e1e093b60 100644
--- a/test/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <test/uitest.hxx>
+#include <vcl/uitest/uitest.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */