Mercurial > octave-nkf

changeset 14265:2254d7c14f41 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provided a patch in the pro for Windows, which does not need qterminal. * octave-gui.pro: Embraced qterminal library with unix tags.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 25 Jan 2012 02:33:10 +0100
parents 6e6194a7b102
children 4a6867289e24
files gui/octave-gui.pro gui/src/MainWindow.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/octave-gui.pro	Tue Jan 24 20:06:26 2012 +0100
+++ b/gui/octave-gui.pro	Wed Jan 25 02:33:10 2012 +0100
@@ -31,7 +31,7 @@
                        languages/es-es.ts \
                        languages/ru-ru.ts \
                        languages/uk-ua.ts           # Available translations
-LIBS                += -lqscintilla2 -Lqterminal/libqterminal -lqterminal $$system(mkoctfile -p LIBS) $$system(mkoctfile -p OCTAVE_LIBS)
+LIBS                += -lqscintilla2  $$system(mkoctfile -p LIBS) $$system(mkoctfile -p OCTAVE_LIBS)
 
 mac {
     CONFIG -= app_bundle
@@ -52,7 +52,7 @@
 }
 
 unix {
-    LIBS +=  -lutil
+    LIBS +=  -lutil -Lqterminal/libqterminal -lqterminal
 }
 
 win32-g++ {
--- a/gui/src/MainWindow.cpp	Tue Jan 24 20:06:26 2012 +0100
+++ b/gui/src/MainWindow.cpp	Wed Jan 25 02:33:10 2012 +0100
@@ -318,7 +318,7 @@
 
   // Chat subwindow.
   m_ircWidgetSubWindow = new NonClosableMdiSubWindow (this);
-  m_ircWidgetSubWindow->setWidget (m_ircWidget);
+  m_ircWidgetSubWindow->setWidget(m_ircWidget);
   m_centralMdiArea->addSubWindow (m_ircWidgetSubWindow, Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint);
 
   m_ircWidgetSubWindow->setObjectName ("ChatWidgetSubWindow");