Mercurial > octave

comparison m4/acinclude.m4 @ 22250:2fd4f1a3f4a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow building with Qt5 (bug #40252) * acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Define HAVE_QT4 or HAVE_QT5. Also check for Qt5PrintSupport when using Qt5. * Canvas.cc, Object.cc, QTerminal.cc, TerminalView.cpp, Vt102Emulation.cpp, konsole_wcwidth.h, find-files-dialog.cc, file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-gui.cc, resource-manager.cc, shortcut-manager.cc, workspace-model.cc, workspace-view.cc: Adapt to Qt5 API changes.
author John W. Eaton <jwe@octave.org>
date Wed, 10 Aug 2016 03:54:42 -0400
parents 66dd260512a4
children 8e18e364a686
comparison
equal deleted inserted replaced
22249:da201af35c97 22250:2fd4f1a3f4a8
1348 4) 1348 4)
1349 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" 1349 QT_MODULES="QtCore QtGui QtNetwork QtOpenGL"
1350 LIBQSCINTILLA=qscintilla2 1350 LIBQSCINTILLA=qscintilla2
1351 ;; 1351 ;;
1352 5) 1352 5)
1353 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL" 1353 QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
1354 LIBQSCINTILLA=qt5scintilla2 1354 LIBQSCINTILLA=qt5scintilla2
1355 ;; 1355 ;;
1356 *) 1356 *)
1357 AC_MSG_ERROR([Unrecognized Qt version $qt_version]) 1357 AC_MSG_ERROR([Unrecognized Qt version $qt_version])
1358 ;; 1358 ;;
1521 ## Let's assume Qscintilla library is at the same location as 1521 ## Let's assume Qscintilla library is at the same location as
1522 ## other regular Qt libraries. 1522 ## other regular Qt libraries.
1523 QT_LIBS="$QT_LIBS -l$LIBQSCINTILLA" 1523 QT_LIBS="$QT_LIBS -l$LIBQSCINTILLA"
1524 OCTAVE_CHECK_QSCINTILLA_VERSION 1524 OCTAVE_CHECK_QSCINTILLA_VERSION
1525 AC_DEFINE(HAVE_QSCINTILLA, 1, 1525 AC_DEFINE(HAVE_QSCINTILLA, 1,
1526 [Define to 1 if the QScintilla library and header files are available]) 1526 [Define to 1 if the QScintilla library and header files are available.])
1527 1527
1528 save_CPPFLAGS="$CPPFLAGS" 1528 save_CPPFLAGS="$CPPFLAGS"
1529 save_CXXFLAGS="$CXXFLAGS" 1529 save_CXXFLAGS="$CXXFLAGS"
1530 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" 1530 CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
1531 CXXFLAGS="$CXXPICFLAG $CXXFLAGS" 1531 CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
1555 octave_qt_versions="$1" 1555 octave_qt_versions="$1"
1556 if test $check_qt = yes; then 1556 if test $check_qt = yes; then
1557 for ver in $octave_qt_versions; do 1557 for ver in $octave_qt_versions; do
1558 OCTAVE_CHECK_QT_VERSION([$ver]) 1558 OCTAVE_CHECK_QT_VERSION([$ver])
1559 if test $build_qt_gui = yes; then 1559 if test $build_qt_gui = yes; then
1560 have_qt_version=$ver
1560 break 1561 break
1561 fi 1562 fi
1562 done 1563 done
1563 1564
1564 if test $build_qt_gui = no; then 1565 if test $build_qt_gui = yes; then
1566 if test x"$have_qt_version" = x4; then
1567 AC_DEFINE(HAVE_QT4, 1, [Define if you are using Qt version 4.])
1568 fi
1569 if test x"$have_qt_version" = x5; then
1570 AC_DEFINE(HAVE_QT5, 1, [Define if you are using Qt version 5.])
1571 fi
1572 else
1565 if test -n "$warn_qt_libraries"; then 1573 if test -n "$warn_qt_libraries"; then
1566 OCTAVE_CONFIGURE_WARNING([warn_qt_libraries]) 1574 OCTAVE_CONFIGURE_WARNING([warn_qt_libraries])
1567 fi 1575 fi
1568 if test -n "$warn_qt_version"; then 1576 if test -n "$warn_qt_version"; then
1569 OCTAVE_CONFIGURE_WARNING([warn_qt_version]) 1577 OCTAVE_CONFIGURE_WARNING([warn_qt_version])