summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-10-08 05:46:07 -0700
committerCaolán McNamara <caolanm@redhat.com>2014-10-08 15:48:29 +0000
commitfa7ce6df6218dfc7ff18fabe8e6f7a5b4038c77b (patch)
treebf97fe6f595240ba3e62a4d54b972d41132afe88
parentfdo#84536 RTF import: don't try to rotate TextFrames (diff)
downloadcore-fa7ce6df6218dfc7ff18fabe8e6f7a5b4038c77b.tar.gz
core-fa7ce6df6218dfc7ff18fabe8e6f7a5b4038c77b.zip
Revert "fdo#80927 - quickstart causing trouble on windows, disable it"
This reverts commit e10e1b06cbbf337e8277063651b6e48011df5fd4. The real solution to fdo#80927 is available now. Change-Id: I25166a348cb0a76cccfa49c82190aad88deb3c47 Reviewed-on: https://gerrit.libreoffice.org/11853 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--scp2/Module_scp2.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 767e4438bb3e..be02cd87a9da 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
) \
$(if $(filter WNT,$(OS)),\
$(if $(DISABLE_ACTIVEX),,InstallModule_activex) \
+ InstallModule_quickstart \
InstallModule_windows \
$(if $(filter MSC,$(COM)),\
InstallModule_winexplorerext \