diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-03-28 15:09:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-30 08:29:14 +0000 |
| commit | 80f113efa6f60c6b3aad33128921792451f114ce (patch) | |
| tree | 0d4077ee44d89c0c1b2baae8ebf6ff8565fd357d /configure.ac | |
| parent | 68dfe73d209091455c79e1f746ca84cf8743629d (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 44 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5751f85937fc..98e2a0e84408 100644 --- a/configure.ac +++ b/configure.ac @@ -11240,6 +11240,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" @@ -11266,12 +11268,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++]) |