[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e4b3e4d85fa914f20f45b90ed1bd09573b1b09b Author: Andras Timar andras.ti...@collabora.com Date: Sat Apr 4 12:48:33 2015 -0700 Bump version to 4.2-29 Change-Id: Ibfa2c1923c47080a44f2b95c82355c6a06901531 diff --git a/configure.ac b/configure.ac index f934297..fac5eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.28],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.29],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b252b59f5cedaf8901d4622c10b0fd259b2e1a95 Author: Andras Timar andras.ti...@collabora.com Date: Mon Mar 16 05:48:40 2015 -0700 Bump version to 4.2-28 Change-Id: I1ff7045b17d945432255b6a805ce6e121dfc807c diff --git a/configure.ac b/configure.ac index a284615..f934297 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.27],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.28],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aac0c2931c7ec431e959c5fdcd1c8e7715ade8f3 Author: Andras Timar andras.ti...@collabora.com Date: Fri Mar 13 09:19:59 2015 +0100 Bump version to 4.2-27 Change-Id: I33f0bc2acc8f94bbebb0e32bca49bbbf65072f6f diff --git a/configure.ac b/configure.ac index 2779fc4..a284615 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.26],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.27],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0eed9d22dfc7ff8fa3d822ffd12b2615eab1a513 Author: Andras Timar andras.ti...@collabora.com Date: Thu Feb 19 03:40:19 2015 -0800 Bump version to 4.2-26 Change-Id: I457bece6409f89f3668e53c9862cd7caf54807a7 diff --git a/configure.ac b/configure.ac index ff31b37..2779fc4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.25],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.26],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7edd532c989a71744b277752c9bef0b5872024be Author: Andras Timar andras.ti...@collabora.com Date: Mon Feb 16 14:21:56 2015 -0800 Bump version to 4.2-25 Change-Id: I5061b96787324fa5c2a718650b8dee4da3b447e3 diff --git a/configure.ac b/configure.ac index 5715f58..ff31b37 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.24],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.25],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e91d901189f8265b82d40b5053c0553174a534d4 Author: Andras Timar andras.ti...@collabora.com Date: Tue Feb 10 00:19:57 2015 -0800 Bump version to 4.2-24 Change-Id: I1acff9fe3e907b303851984674da33dff5ed0e08 diff --git a/configure.ac b/configure.ac index d996ab6..5715f58 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.23],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.24],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit faf1498e0e2d1ab60eb7d88bced8cebe49584d28 Author: Andras Timar andras.ti...@collabora.com Date: Tue Jan 27 11:04:50 2015 -0800 Bump version to 4.2-23 Change-Id: Ica66c89fe86c18c436290a03849aa5ebfb4e8bc3 diff --git a/configure.ac b/configure.ac index 3edc486..d996ab6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.22],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.23],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 74fb0cb74bc62b5d652f0fb10f8dc3b4795c6cd3 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jan 8 14:19:24 2015 -0800 Bump version to 4.2-22 Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0 diff --git a/configure.ac b/configure.ac index 35c7af1..3edc486 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.21],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.22],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24253481d0f3075cd7f3670e3ed7806d61094360 Author: Andras Timar andras.ti...@collabora.com Date: Mon Nov 10 12:19:16 2014 -0800 Bump version to 4.2-19 Change-Id: Ie02193db64ea94de1f1df6a2e2aa6d13ddbd72e2 diff --git a/configure.ac b/configure.ac index a9f0bfc..ed38062 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.18],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.19],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1efecdfac65b5eafa7b56d8eafb70d39107144ce Author: Andras Timar andras.ti...@collabora.com Date: Mon Oct 6 21:58:07 2014 +0200 Bump version to 4.2-17 Change-Id: If617f1ebf76d20fc79ce5e01b4e293fa3f6c37fd diff --git a/configure.ac b/configure.ac index beef1a8..d495588 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.16],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.17],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c03ae0dedf3bf901b386ba334aabe2205b1808f3 Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 22 13:26:36 2014 -0700 Bump version to 4.2-18 Change-Id: Ib252bb7fbc0e00035165c2033a36f235ecbe43d7 diff --git a/configure.ac b/configure.ac index d495588..a9f0bfc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.17],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.18],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f8a66093ef5baeae57fbf12a4010d615462be0e Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:43:50 2014 +0300 Bump build number for new App Store attempt Change-Id: Icdc0cc6b06b4354a2068a8dc8a1a9182da8e8d97 diff --git a/configure.ac b/configure.ac index b3bb9ba..1f3c898 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.9],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.10],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c1a78b209ac600165a39559550370468cba864c Author: Andras Timar andras.ti...@collabora.com Date: Wed Sep 10 04:59:43 2014 -0700 Bump version to 4.2-9 Change-Id: Ief72a8a091c8e3e37bf5a5190dc95d0ebb7405b7 diff --git a/configure.ac b/configure.ac index c721987..f77e6dd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.8],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.9],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55132f7bbb3d173d36040bf436dd3b2a4ab65997 Author: Andras Timar andras.ti...@collabora.com Date: Sun Jul 6 10:53:14 2014 +0200 Bump version to 4.2-7 Change-Id: I38541aa8418e1823c3016879d3cd26f91929f20c diff --git a/configure.ac b/configure.ac index 1dff767..ac2dbd7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.6],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.7],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a1d4d4d12d8b1209ee8c90e0ecf16669864ecec1 Author: Andras Timar andras.ti...@collabora.com Date: Thu Jun 19 12:27:32 2014 +0200 Bump version to 4.2-6 Change-Id: Ic2cbed6d421c693bdb8d3f3fa3a5cffbfc0accc0 diff --git a/configure.ac b/configure.ac index 84427b9..1dff767 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.5],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.6],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9023bfdd3ec8a7711fe0dfba1fd00645ffd0c685 Author: Andras Timar andras.ti...@collabora.com Date: Thu May 22 16:16:14 2014 +0200 Bump version to 4.2-4 Change-Id: Ia0ad7166369086d24f199a87de43119f59d6b683 diff --git a/configure.ac b/configure.ac index bdcb5d3..4f6d9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.3],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.4],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac vcl/CustomTarget_kde4_moc.mk vcl/unx
configure.ac | 45 -
vcl/CustomTarget_kde4_moc.mk |3
vcl/unx/kde4/KDE4FilePicker.cxx | 21 +---
vcl/unx/kde4/KDESalInstance.cxx |2
vcl/unx/kde4/KDEXLib.cxx | 21 ++--
vcl/unx/kde4/KDEXLib.hxx |4
vcl/unx/kde4/VCLKDEApplication.cxx| 44
vcl/unx/kde4/VCLKDEApplication.hxx|2
vcl/unx/kde4/tst_exclude_posted_events.hxx| 72 ++
vcl/unx/kde4/tst_exclude_socket_notifiers.hxx | 130 --
10 files changed, 231 insertions(+), 113 deletions(-)
New commits:
commit c6b6fff63d9ce900bed5eda550ea1af9d854bc8d
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Fri Mar 28 15:09:13 2014 +0100
fix KFileDialog crashes (fdo#69002)
Requires Qt patches (or otherwise LO generic file dialog is used).
Squashed from several master patches.
(cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
(cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
(cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
(cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
(cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
(cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875)
(cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f)
(cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)
Change-Id: I6dba5da0170fb94bab928f71efc7dc8c03cc70d9
Reviewed-on: https://gerrit.libreoffice.org/9206
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/configure.ac b/configure.ac
index a6d36c5..bc268e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11283,6 +11283,8 @@ int main(int argc, char **argv) {
AC_DEFINE(KDE_HAVE_GLIB,1)
KDE_GLIB_CFLAGS=$(printf '%s' $KDE_GLIB_CFLAGS | sed -e
s/-I/${ISYSTEM?}/g)
+qt4_fix_warning=
+
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
@@ -11309,12 +11311,53 @@ int main(int argc, char *argv[])
AC_MSG_RESULT([yes])
],[
AC_MSG_RESULT([no])
-AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime - fix your Qt4 library!])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-37380 (needed)
])
# Remove meta object data
rm -f ${TSTBASE}.*
+AC_MSG_CHECKING([whether Qt avoids QClipboard recursion caused by
posted events])
+
+# Prepare meta object data
+TSTBASE=tst_exclude_posted_events
+TSTMOC=${SRC_ROOT}/vcl/unx/kde4/${TSTBASE}
+ln -fs ${TSTMOC}.hxx
+$MOC4 ${TSTBASE}.hxx -o ${TSTBASE}.moc
+
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include tst_exclude_posted_events.moc
+
+int main(int argc, char *argv[])
+{
+QCoreApplication app(argc, argv);
+exit(tst_excludePostedEvents());
+return 0;
+}
+]])],[
+AC_MSG_RESULT([yes])
+],[
+AC_MSG_RESULT([no])
+AC_MSG_WARN([native KDE4 file pickers will be disabled at
runtime])
+if test -z $qt4_fix_warning; then
+add_warning native KDE4 file pickers will be disabled at
runtime, Qt4 fixes needed
+fi
+qt4_fix_warning=1
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-34614 (needed)
+])
+
+# Remove meta object data
+rm -f ${TSTBASE}.*
+
+if test -n $qt4_fix_warning; then
+add_warning
https://bugreports.qt-project.org/browse/QTBUG-38585 (recommended)
+fi
+
LIBS=$save_LIBS
CXXFLAGS=$save_CXXFLAGS
AC_LANG_POP([C++])
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 9e41754..16d1561 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -12,7 +12,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
$(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc \
$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDE4FilePicker.moc \
- $(call
gb_CustomTarget_get_workdir,vcl/unx/kde4)/tst_exclude_socket_notifiers.moc
+ $(call
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0d7cf25bfb2e3c4e085c619ce40b761f83a94d0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Apr 8 13:16:44 2014 +0200
typo from 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8
Change-Id: I48694c4fc4ee709d8ca8b3bba2207c098533cde3
diff --git a/configure.ac b/configure.ac
index 54fd9f6..6ae390c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9284,7 +9284,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1])
if test $COM = MSC; then
APR_LIB_DIR=LibR
-test -n MSVC_USE_DEBUG_RUNTIME APR_LIB_DIR=LibD
+test -n ${MSVC_USE_DEBUG_RUNTIME} APR_LIB_DIR=LibD
APR_LIBS=${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib
fi
@@ -9293,7 +9293,7 @@ serf)
[-L${WORKDIR}/UnpackedTarball/serf/.libs
-lserf-1])
if test $COM = MSC; then
SERF_LIB_DIR=Release
-test -n MSVC_USE_DEBUG_RUNTIME SERF_LIB_DIR=Debug
+test -n ${MSVC_USE_DEBUG_RUNTIME} SERF_LIB_DIR=Debug
SERF_LIBS=${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib
fi
;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) New commits: commit b2fd4bfe76c3ebc219f312d86d9759e5cb4131ac Author: Tor Lillqvist t...@collabora.com Date: Thu Dec 26 17:25:30 2013 +0200 When using --with-macosx-sdk=10.8 or 9, use xcode-select -print-path I want to be able to use of a separate Xcode installation (like a developer preview) instead of the /Applications/Xcode.app one. Change-Id: I1faa84d028a8df6b4fc61b321fd2a6cde9a0ab0f diff --git a/configure.ac b/configure.ac index b8def00..0e112bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2706,13 +2706,9 @@ if test $_os = Darwin; then fi ;; 10.8|10.9) -if test -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then - MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk -else -xcodepath=`xcode-select -print-path` -if test -d $xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then - MACOSX_SDK_PATH=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk -fi +xcodepath=`xcode-select -print-path` +if test -d $xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk; then + MACOSX_SDK_PATH=$xcodepath/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$with_macosx_sdk.sdk fi ;; esac ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
