[Gnash-commit] gnash gui/am-frag/qtopia.am ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/11/29 17:02:28

Modified files:
        gui/am-frag    : qtopia.am 
        .              : ChangeLog 

Log message:
                * gui/am-frag/qtopia.am: Use HAVE_QT_2 instead of HAVE_QTOPIA_2.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/qtopia.am?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5017&r2=1.5018

Patches:
Index: gui/am-frag/qtopia.am
===================================================================
RCS file: /sources/gnash/gnash/gui/am-frag/qtopia.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/am-frag/qtopia.am       29 Nov 2007 07:22:36 -0000      1.3
+++ gui/am-frag/qtopia.am       29 Nov 2007 17:02:28 -0000      1.4
@@ -3,11 +3,11 @@
 # 
 if BUILD_QTOPIA_GUI
 bin_PROGRAMS += qtopia-gnash
+if HAVE_QT_2
+QT_CFLAGS += -DQT_QWS_IPAQ -DQWS
+endif
 qtopia_gnash_CPPFLAGS = -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
         $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
-if HAVE_QTOPIA_2
-qtopia_gnash_CPPFLAGS += -DQT_QWS_IPAQ -DQWS
-endif
 qtopia_gnash_SOURCES = $(GUI_SRCS) gui_kde.cpp
 qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
 #qtopia_gnash_DEPENDENCIES = .configline

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5017
retrieving revision 1.5018
diff -u -b -r1.5017 -r1.5018
--- ChangeLog   29 Nov 2007 14:39:40 -0000      1.5017
+++ ChangeLog   29 Nov 2007 17:02:28 -0000      1.5018
@@ -1,3 +1,7 @@
+2007-11-29  Rob Savoye  <address@hidden>
+
+       * gui/am-frag/qtopia.am: Use HAVE_QT_2 instead of HAVE_QTOPIA_2.
+
 2007-11-29 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: don't test 
video
@@ -55,7 +59,7 @@
        * configure.ac: Remove duplicate AC_DEFINE of HAVE_QTOPIA.
        * macros/agg.m4: Put double quotes around sub-shell invocation to
        avoid problems with the buggy bash.
-       * macros/qt.m4: Cleanup hpw the version number gets set from
+       * macros/qt.m4: Cleanup how the version number gets set from
        QTDIR.
        * macros/qtopia.m4: Add more modules to qt_headers.
        * gui/kde.cpp: Add support for Qt2.
@@ -84,10 +88,10 @@
        modified heavily to use QTDIR correctly, and to handle multiple
        differing versions of QT APIs. For now the default is to use Qt3
        instead of Qt4.
-       * macros/kde.m4: QT stuff moved to it;'s own file.
+       * macros/kde.m4: QT stuff moved to it's own file.
        * macros/qtopia.m4: Change how the version and topdir get set
        based on now correctly handling QPEDIR.
-       * configure.ac: Add Automake conditrional for cross compiling. Add
+       * configure.ac: Add Automake conditional for cross compiling. Add
        more Automake conditionals for the different QT versions.
 
 2007-11-28 Markus Gothe <address@hidden>