diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/Library_tk.mk | 1 | ||||
| -rw-r--r-- | toolkit/prj/build.lst | 18 |
2 files changed, 2 insertions, 17 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 60d13418fa5b..7fe38ac64dc7 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Library_add_exception_objects,tk,\ toolkit/source/awt/vclxwindow \ toolkit/source/awt/vclxwindow1 \ toolkit/source/awt/vclxwindows \ + toolkit/source/awt/stylesettings \ toolkit/source/awt/xsimpleanimation \ toolkit/source/awt/xthrobber \ toolkit/source/controls/accessiblecontrolcontext \ diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index e1e9b370628f..7abd412d1103 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,28 +1,12 @@ -<<<<<<< local ti toolkit : vcl NULL ti toolkit usr1 - all ti_mkout NULL ti toolkit\prj nmake - all ti_prj NULL -======= -ti toolkit : vcl NULL -ti toolkit usr1 - all ti_mkout NULL -ti toolkit\prj get - all ti_prj NULL -ti toolkit\inc nmake - all ti_inc NULL -ti toolkit\uiconfig\layout nmake - all ti_uiconfig_layout NULL -ti toolkit\source\helper nmake - all ti_helper ti_inc NULL -ti toolkit\source\awt nmake - all ti_awt ti_inc NULL -ti toolkit\source\controls nmake - all ti_controls ti_inc NULL -ti toolkit\source\controls\tree nmake - all ti_tree NULL -ti toolkit\source\controls\grid nmake - all ti_grid NULL -ti toolkit\source\layout\core nmake - all ti_layout_core NULL -ti toolkit\source\layout\vcl nmake - all ti_layout_vcl NULL -ti toolkit\util nmake - all ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL ti toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL - # fail on unxsoli4 #ti toolkit\qa\complex\xunitconversion nmake - all ti_complex_conv ti_util NULL # fails # ti toolkit\qa\complex\toolkit nmake - all ti_complex_ti ti_qa_complex_toolkit_interface_tests ti_util NULL ->>>>>>> other + |