summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-12 16:21:23 +0100
committerMichael Stahl <mstahl@redhat.com>2017-04-12 22:59:42 +0200
commit9f565f5cb628dcd32b05be7079dd5482e5cc19b9 (patch)
tree686e8d4db7cb6f2c7470028e82a33cf1e11660f5 /fpicker
parent76fbd18a515e531f1d238ab0b405212a032c53f2 (diff)
can use gb_CppunitTest_use_configuration and still access .ui files
after... commit 506cab1a01b0481d0831a7a692a26dc5a5b55e91 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Apr 12 16:14:10 2017 +0100 take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR Change-Id: I9cffdc092206c038da32a32a2cfe629e68b5c258 Change-Id: I906d16037cdf0b9203a4120cb1a5e9846a5c7b7f Reviewed-on: https://gerrit.libreoffice.org/36482 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/CppunitTest_fpicker_dialogs_test.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk b/fpicker/CppunitTest_fpicker_dialogs_test.mk
index 1bf3ae17a9c3..92f8989aedc9 100644
--- a/fpicker/CppunitTest_fpicker_dialogs_test.mk
+++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk
@@ -55,8 +55,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,fpicker_dialogs_t
$(eval $(call gb_CppunitTest_use_rdb,fpicker_dialogs_test,services))
-# $(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,fpicker_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
$(eval $(call gb_CppunitTest_use_uiconfigs,fpicker_dialogs_test,\
fps \