Mercurial > octave-nkf
diff configure.ac @ 17599:f5950975a172
community news dock widget and other user info in GUI
* news-dock-widget.h, news-dock-widget.cc: New files.
* libgui/src/module.mk: Update file lists.
* configure.ac: Check for QtWebKit module.
* default-qt-settings.in: Update default geometry.
* main-window.cc, main-window.h (main_window::news_window):
New data member.
(main_window::dock_widget_list): Include it in the list.
(main_window::display_release_notes,
main_window::display_url_in_window, main_window::construct_news_menu):
New functions.
(main_window::construct): Add news_window dock widget.
(main_window::construct_menu_bar): Call construct_news_menu.
(main_window::construct_window_menu): New items for Showing news
window and menu.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 07 Oct 2013 21:13:11 -0400 |
parents | 1c7d768c3847 |
children | 482222fe5b35 |
line wrap: on
line diff
--- a/configure.ac Mon Oct 07 22:35:55 2013 -0400 +++ b/configure.ac Mon Oct 07 21:13:11 2013 -0400 @@ -2623,16 +2623,16 @@ if test $build_gui = yes; then ## Check for Qt libraries - PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork], + PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork, QtWebKit], [], [AC_MSG_WARN([Qt libraries not found -- disabling GUI]) build_gui=no]) if test $build_gui = yes; then ## Retrieve Qt compilation and linker flags - QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork`" - QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork`" - QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork`" + QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork QtWebKit`" + QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork QtWebKit`" + QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork QtWebKit`" ## Check for Qt4 if ! `$PKG_CONFIG --atleast-version=4.0.0 QtCore`; then