Move qt5 headers into vcl top-level include

they will be used by kde5 vcl plugin

Change-Id: Ibcece683802c7a448b165da4c2515408d641927c

18 files changed, 2 insertions, 1 deletions

diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index 20b2da3ef280..aabe77d9a9c5 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -16,7 +16,7 @@ $(call gb_CustomTarget_get_target,vcl/qt5) : \
 	$(call gb_CustomTarget_get_workdir,vcl/qt5)/Qt5Widget.moc \
 
 $(call gb_CustomTarget_get_workdir,vcl/qt5)/%.moc : \
-		$(SRCDIR)/vcl/qt5/%.hxx \
+		$(SRCDIR)/vcl/inc/qt5/%.hxx \
 		| $(call gb_CustomTarget_get_workdir,vcl/qt5)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
 	$(MOC5) $< -o $@
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 04fcd8d2ea9f..8894bee3f4e1 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_qt5,vcl/qt5))
 $(eval $(call gb_Library_set_include,vclplug_qt5,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/qt5 \
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_qt5,\
diff --git a/vcl/qt5/Qt5Bitmap.hxx b/vcl/inc/qt5/Qt5Bitmap.hxx
index 6ecdebed5ca1..6ecdebed5ca1 100644
--- a/vcl/qt5/Qt5Bitmap.hxx
+++ b/vcl/inc/qt5/Qt5Bitmap.hxx
diff --git a/vcl/qt5/Qt5Data.hxx b/vcl/inc/qt5/Qt5Data.hxx
index f8cf4fb05e6a..f8cf4fb05e6a 100644
--- a/vcl/qt5/Qt5Data.hxx
+++ b/vcl/inc/qt5/Qt5Data.hxx
diff --git a/vcl/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 1aa19b3459f4..1aa19b3459f4 100644
--- a/vcl/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
diff --git a/vcl/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index 9468cf15b4e3..9468cf15b4e3 100644
--- a/vcl/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
diff --git a/vcl/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index b5f31387b3e2..b5f31387b3e2 100644
--- a/vcl/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
diff --git a/vcl/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index af21ee462b18..af21ee462b18 100644
--- a/vcl/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
diff --git a/vcl/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 0a4892c15533..0a4892c15533 100644
--- a/vcl/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
diff --git a/vcl/qt5/Qt5Object.hxx b/vcl/inc/qt5/Qt5Object.hxx
index df62016aded1..df62016aded1 100644
--- a/vcl/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/Qt5Object.hxx
diff --git a/vcl/qt5/Qt5Painter.hxx b/vcl/inc/qt5/Qt5Painter.hxx
index 3434d80741a4..3434d80741a4 100644
--- a/vcl/qt5/Qt5Painter.hxx
+++ b/vcl/inc/qt5/Qt5Painter.hxx
diff --git a/vcl/qt5/Qt5Printer.hxx b/vcl/inc/qt5/Qt5Printer.hxx
index aad9e3566ce5..aad9e3566ce5 100644
--- a/vcl/qt5/Qt5Printer.hxx
+++ b/vcl/inc/qt5/Qt5Printer.hxx
diff --git a/vcl/qt5/Qt5Timer.hxx b/vcl/inc/qt5/Qt5Timer.hxx
index 74f9ea712019..74f9ea712019 100644
--- a/vcl/qt5/Qt5Timer.hxx
+++ b/vcl/inc/qt5/Qt5Timer.hxx
diff --git a/vcl/qt5/Qt5Tools.hxx b/vcl/inc/qt5/Qt5Tools.hxx
index c7b47014beb0..c7b47014beb0 100644
--- a/vcl/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/Qt5Tools.hxx
diff --git a/vcl/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/Qt5VirtualDevice.hxx
index 80ed0fcf92d1..80ed0fcf92d1 100644
--- a/vcl/qt5/Qt5VirtualDevice.hxx
+++ b/vcl/inc/qt5/Qt5VirtualDevice.hxx
diff --git a/vcl/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 83077796298f..83077796298f 100644
--- a/vcl/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
diff --git a/vcl/qt5/tst_exclude_posted_events.hxx b/vcl/inc/qt5/tst_exclude_posted_events.hxx
index 79c9887f843e..79c9887f843e 100644
--- a/vcl/qt5/tst_exclude_posted_events.hxx
+++ b/vcl/inc/qt5/tst_exclude_posted_events.hxx
diff --git a/vcl/qt5/tst_exclude_socket_notifiers.hxx b/vcl/inc/qt5/tst_exclude_socket_notifiers.hxx
index 7f4d2e3d6244..7f4d2e3d6244 100644
--- a/vcl/qt5/tst_exclude_socket_notifiers.hxx
+++ b/vcl/inc/qt5/tst_exclude_socket_notifiers.hxx