diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-04-25 14:06:57 +0200 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-25 22:36:31 +1000 |
| commit | 8fd08d76374c348bc1b46f6387d00a755a619290 (patch) | |
| tree | 571d725df0005463b08c70f6415ca2b053176b29 | |
| parent | 487b61a1d6d30e0d703494d1de975580525f5d91 (diff) | |
add better info on the Qt patches needed for KFileDialog
Change-Id: I1902f962ac03b171c5e7a45d9c8e59450b04418f
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | vcl/unx/kde4/KDEXLib.cxx | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 507678adb3f4..d377325a20d6 100644 --- a/configure.ac +++ b/configure.ac @@ -11243,6 +11243,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" @@ -11269,7 +11271,12 @@ 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 @@ -11296,12 +11303,21 @@ 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-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/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index f6c15b06076c..faa1ff1a278d 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -192,9 +192,9 @@ void KDEXLib::Init() // that will release SolarMutex when waiting for more events. // Moreover there are bugs in Qt event loop code that allow QClipboard recursing because the event // loop processes also events that it should not at that point, so no dialogs in that case either. + // https://bugreports.qt-project.org/browse/QTBUG-37380 + // https://bugreports.qt-project.org/browse/QTBUG-34614 if (m_isGlibEventLoopType && (0 == tst_processEventsExcludeSocket()) && tst_excludePostedEvents() == 0 ) - // See http://bugreports.qt.nokia.com/browse/QTBUG-37380 - // https://bugreports.qt-project.org/browse/QTBUG-34614 m_allowKdeDialogs = true; #endif |