Author: damjan Date: Sun Mar 20 22:01:09 2016 New Revision: 1735908 URL: http://svn.apache.org/viewvc?rev=1735908&view=rev Log: Finish the outstanding bits of r1409500 from branches/gbuild: qswin32.h needs to be moved from setup_native to sfx2 for AOO to build on Windows.
Patch by: me Added: openoffice/branches/gbuild-reintegration/main/sfx2/inc/sfx2/qswin32.h - copied unchanged from r1735907, openoffice/branches/gbuild-reintegration/main/setup_native/inc/setup_native/qswin32.h Removed: openoffice/branches/gbuild-reintegration/main/setup_native/inc/setup_native/qswin32.h Modified: openoffice/branches/gbuild-reintegration/main/sfx2/Package_inc.mk Modified: openoffice/branches/gbuild-reintegration/main/sfx2/Package_inc.mk URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/sfx2/Package_inc.mk?rev=1735908&r1=1735907&r2=1735908&view=diff ============================================================================== --- openoffice/branches/gbuild-reintegration/main/sfx2/Package_inc.mk (original) +++ openoffice/branches/gbuild-reintegration/main/sfx2/Package_inc.mk Sun Mar 20 22:01:09 2016 @@ -131,6 +131,7 @@ $(eval $(call gb_Package_add_file,sfx2_i $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/CommandInfoProvider.hxx,sfx2/sidebar/CommandInfoProvider.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControlFactory.hxx,sfx2/sidebar/ControlFactory.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sidebar/ControllerFactory.hxx,sfx2/sidebar/ControllerFactory.hxx))