Mercurial > octave

changeset 28748:9cd608134ec5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 15 Sep 2020 08:42:45 +0200
parents 7dcc4cb6da53 (current diff) b12ff2cea46a (diff)
children 4e10e25f0fc6
files libgui/src/m-editor/find-dialog.cc test/mex/module.mk
diffstat 3 files changed, 22 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc	Mon Sep 14 16:32:42 2020 -0700
+++ b/libgui/src/m-editor/find-dialog.cc	Tue Sep 15 08:42:45 2020 +0200
@@ -224,7 +224,14 @@
 
     // Save position
     QPoint dlg_pos = pos ();
-    m_last_position = QPoint (dlg_pos.x (), dlg_pos.y ());
+
+#if defined (Q_OS_WIN32)
+    int y = dlg_pos.y ();
+#else
+    int y = dlg_pos.y () - geometry ().height () + frameGeometry ().height ();
+#endif
+
+    m_last_position = QPoint (dlg_pos.x (), y);
 
     s->setValue (ed_fdlg_pos.key, m_last_position);
 
--- a/scripts/testfun/__debug_octave__.m	Mon Sep 14 16:32:42 2020 -0700
+++ b/scripts/testfun/__debug_octave__.m	Tue Sep 15 08:42:45 2020 +0200
@@ -38,7 +38,7 @@
 ## @example
 ## @group
 ## __debug_octave__ ()
-## __debug_octave__ ("start gdb -p %d")
+## __debug_octave__ ("cmd /c start gdb -p %d")
 ## @end group
 ## @end example
 ## @end deftypefn
@@ -57,7 +57,7 @@
     if (isunix ())
       command_string = "x-terminal-emulator -e gdb -p %d";
     elseif (ispc ())
-      command_string = "start gdb -p %d";
+      command_string = "cmd /c start gdb -p %d";
     elseif (ismac ())
       command_string = "osascript -e 'tell application \"Terminal\" to do script \"lldb -p %d\"'";
     else
--- a/test/mex/module.mk	Mon Sep 14 16:32:42 2020 -0700
+++ b/test/mex/module.mk	Tue Sep 15 08:42:45 2020 +0200
@@ -12,8 +12,8 @@
 MEX_TEST_FUNCTIONS = $(MEX_TEST_SRC:%.c=%.mex)
 
 ## Since these definitions for MKOCTFILE and MKMEXFILE are only used
-## here, defining them in this file is probably OK.  If there are ever
-## used elsewhre, maybe then they could be moved to build-aux/module.mk
+## here, defining them in this file is probably OK.  If they are ever
+## used elsewhere, maybe then they could be moved to build-aux/module.mk
 ## or the main Makefile.am file.  The MKOCTFILE variables are included
 ## for completeness, in case we someday want to test building .oct
 ## files as well.
@@ -32,14 +32,22 @@
 MKOCTFILECPPFLAGS = \
   -I$(top_srcdir)/libinterp/corefcn \
   -Ilibinterp/corefcn
+MKOCTFILELDFLAGS = \
+  -L$(top_builddir)/libinterp/.lib \
+  -L$(top_builddir)/liboctave/.lib
 
-MKOCTFILE = $(top_builddir)/src/mkoctfile $(MKOCTFILECPPFLAGS)
+MKOCTFILE = \
+  $(top_builddir)/src/mkoctfile $(MKOCTFILECPPFLAGS) $(MKOCTFILELDFLAGS)
 
 MKMEXFILECPPFLAGS = \
   -I$(top_srcdir)/libinterp/corefcn \
   -Ilibinterp/corefcn
+MKMEXFILELDFLAGS = \
+  -L$(top_builddir)/libinterp/.lib \
+  -L$(top_builddir)/liboctave/.lib
 
-MKMEXFILE = $(top_builddir)/src/mkoctfile --mex $(MKMEXFILECPPFLAGS)
+MKMEXFILE = \
+  $(top_builddir)/src/mkoctfile --mex $(MKMEXFILECPPFLAGS) $(MKMEXFILELDFLAGS)
 
 $(MEX_TEST_FUNCTIONS) : %.mex : %.c | %reldir%/$(octave_dirstamp)
 	$(AM_V_mkmexfile)$(MKMEXFILE) $(AM_VOPT_mkmexfile) $< -o $@ || rm -f $@