* #include <sys/wait.h> is not needed to compile Bufferview_pimpl.C
* Remove the Q_EXPORT directive from the QGridView declaration as it breaks
compilation on Windows. No effect whatsoever on *nix machines.
I'll just commit these...
--
Angus
Index: src/BufferView_pimpl.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/BufferView_pimpl.C,v
retrieving revision 1.322.2.3
diff -u -p -r1.322.2.3 BufferView_pimpl.C
--- src/BufferView_pimpl.C 7 Dec 2004 10:48:01 -0000 1.322.2.3
+++ src/BufferView_pimpl.C 14 Dec 2004 10:58:51 -0000
@@ -63,7 +63,6 @@
#include "BoostFormat.h"
#include <unistd.h>
-#include <sys/wait.h>
using std::vector;
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1021.2.50
diff -u -p -r1.1021.2.50 ChangeLog
--- src/ChangeLog 14 Dec 2004 10:27:59 -0000 1.1021.2.50
+++ src/ChangeLog 14 Dec 2004 10:59:01 -0000
@@ -1,5 +1,9 @@
2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+ * BufferView_pimpl.C: remove unnecessary #include <sys/wait.h>.
+
+2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+
* Makefile.am: change targets lyx_main.o and main.o to
lyx_main.$(OBJEXT) and main.$(OBJEXT) to ensure compilation
proceeds on Windows machines.
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.389.2.55
diff -u -p -r1.389.2.55 ChangeLog
--- src/frontends/qt2/ChangeLog 14 Dec 2004 10:40:06 -0000 1.389.2.55
+++ src/frontends/qt2/ChangeLog 14 Dec 2004 10:59:06 -0000
@@ -1,5 +1,12 @@
2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+ * qgridview.h (class QGridView): remove invalid Q_EXPORT declaration
+ as it breaks compilation of the generated qgridview_moc.C on
+ Windows machines. Has no effect on *nix machines where Q_EXPORT expands
+ to an empty string.
+
+2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+
* Makefile.am (INCLUDES):
* moc/Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
to overcome bug in the MinGW port of g++ 3.4.2.
Index: src/frontends/qt2/qgridview.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qgridview.h,v
retrieving revision 1.2
diff -u -p -r1.2 qgridview.h
--- src/frontends/qt2/qgridview.h 1 Dec 2002 22:59:19 -0000 1.2
+++ src/frontends/qt2/qgridview.h 14 Dec 2004 10:59:07 -0000
@@ -44,7 +44,7 @@
class QGridViewPrivate;
-class Q_EXPORT QGridView : public QScrollView
+class QGridView : public QScrollView
{
Q_OBJECT
Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.736
diff -u -p -r1.736 ChangeLog
--- src/frontends/qt2/ChangeLog 14 Dec 2004 10:41:06 -0000 1.736
+++ src/frontends/qt2/ChangeLog 14 Dec 2004 11:02:20 -0000
@@ -1,5 +1,12 @@
2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+ * qgridview.h (class QGridView): remove invalid Q_EXPORT declaration
+ as it breaks compilation of the generated qgridview_moc.C on
+ Windows machines. Has no effect on *nix machines where Q_EXPORT expands
+ to an empty string.
+
+2004-12-14 Angus Leeming <[EMAIL PROTECTED]>
+
* Makefile.am (AM_CPPFLAGS):
* moc/Makefile.am (AM_CPPFLAGS): Remove trailing slash from -Ifoo/
to overcome bug in the MinGW port of g++ 3.4.2.
Index: src/frontends/qt2/qgridview.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qgridview.h,v
retrieving revision 1.2
diff -u -p -r1.2 qgridview.h
--- src/frontends/qt2/qgridview.h 1 Dec 2002 22:59:19 -0000 1.2
+++ src/frontends/qt2/qgridview.h 14 Dec 2004 11:02:21 -0000
@@ -44,7 +44,7 @@
class QGridViewPrivate;
-class Q_EXPORT QGridView : public QScrollView
+class QGridView : public QScrollView
{
Q_OBJECT
Q_PROPERTY( int numRows READ numRows WRITE setNumRows )
