[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-323-g66632d8 |
|
Date: |
Tue, 22 Mar 2011 13:46:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 66632d85cd75d33fc1d78e21d8a64fceba9a40f0 (commit)
via 5d96a868950ddc4fc018248c2dca0fb0bb0a96ce (commit)
from 13ec9e4709b0fbb6f2e5b996fa8a67f5aebeaf40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=66632d85cd75d33fc1d78e21d8a64fceba9a40f0
commit 66632d85cd75d33fc1d78e21d8a64fceba9a40f0
Author: Benjamin Wolsey <address@hidden>
Date: Tue Mar 22 14:38:57 2011 +0100
Don't require kde headers for the kde4 (really: Qt4) GUI.
diff --git a/Makefile.am b/Makefile.am
index 4f02700..60c65c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -242,9 +242,9 @@ if BUILD_KDE3_GUI
@echo " KDE3_CFLAGS is $(KDE3_CFLAGS)"
@echo " KDE3_LIBS is $(KDE3_LIBS)"
endif
-if BUILD_KDE4_GUI
- @echo " KDE4_CFLAGS is $(KDE4_CFLAGS)"
- @echo " KDE4_LIBS is $(KDE4_LIBS)"
+if BUILD_QT4_GUI
+ @echo " QT4_CFLAGS is $(QT4_CFLAGS)"
+ @echo " QT4_LIBS is $(QT4_LIBS)"
endif
if BUILD_QT3_GUI
@echo " QT3_CFLAGS is $(QT3_CFLAGS)"
@@ -378,8 +378,8 @@ endif
if BUILD_KDE3_GUI
@echo " Supported GUI: KDE3"
endif
-if BUILD_KDE4_GUI
- @echo " Supported GUI: KDE4"
+if BUILD_QT4_GUI
+ @echo " Supported GUI: QT4"
endif
if BUILD_QTOPIA3_GUI
@echo " Supported GUI: QTOPIA3"
diff --git a/configure.ac b/configure.ac
index e3f8a7b..a5cdb4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,7 +541,7 @@ dnl --------------------------------------------------------
build_haiku=no
build_aos4=no dnl AmigaOS4 GUI
build_kde3=no dnl WARNING: doesn't work (see
https://savannah.gnu.org/bugs/index.php?31782)
-build_kde4=no
+build_qt4=no
build_qtopia3=no
build_qtopia4=no
build_gtk=no
@@ -565,7 +565,7 @@ AC_ARG_ENABLE(gui,
build_kde3=yes
;;
kde4|KDE4)
- build_kde4=yes
+ build_qt4=yes
;;
qtopia3|QTOPIA3)
build_qtopia3=yes
@@ -601,7 +601,7 @@ AC_ARG_ENABLE(gui,
build_fb=yes
fi
if test x${openbsd} != xyes; then
- build_kde4=yes
+ build_qt4=yes
fi
build_sdl=yes
build_gtk=yes
@@ -623,7 +623,7 @@ AC_ARG_ENABLE(gui,
else if test x"${haiku}" = xyes; then
build_haiku=yes;
else
- build_kde4=auto
+ build_qt4=auto
build_gtk=yes
build_dump=auto
fi
@@ -1588,20 +1588,15 @@ if test x$build_gtk = xyes; then
fi
fi
-
-if test x"${build_kde4}" != xno -o x"${build_qtopia4}" != xno; then
+if test x"${build_qt4}" != xno; then
GNASH_PATH_QT4
fi
-if test x"${build_kde4}" != xno; then
- GNASH_PATH_KDE4
-fi
-
-if test x"${build_kde4}" = xauto; then
- if test x"${has_qt4}" = xyes -a x"${has_kde4}" = xyes; then
- build_kde4=yes
+if test x"${build_qt4}" = xauto; then
+ if test x"${has_qt4}" = xyes; then
+ build_qt4=yes
else
- build_kde4=no
+ build_qt4=no
fi
fi
@@ -1800,7 +1795,11 @@ AC_ARG_ENABLE(kparts4,
yes) build_kparts4=yes ;;
no) build_kparts4=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --disable-kparts4 option]) ;;
-esac],build_kparts4=$build_kde4)
+esac],build_kparts4=$build_qt4)
+
+if test x"${build_kparts4}" != xno; then
+ GNASH_PATH_KDE4
+fi
dnl -----------------------------------------------------------
dnl Add NPAPI support, if specified or GTK or KDE4 gui is built
@@ -1813,7 +1812,7 @@ AC_ARG_ENABLE(npapi,
no) npapi=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for disable-npapi option]) ;;
esac],
- if test x$build_gtk = xyes -o x$build_kde4 = xyes; then
+ if test x$build_gtk = xyes -o x$build_qt4 = xyes; then
npapi=yes
fi
)
@@ -2245,7 +2244,6 @@ AM_CONDITIONAL(HAVE_KDE4, [test x$has_kde4 = xyes])
AM_CONDITIONAL(HAVE_QT3, [test x$has_qt3 = xyes])
AM_CONDITIONAL(HAVE_QT4, [test x$has_qt4 = xyes])
-AM_CONDITIONAL(WITH_KDE4, [test "$with_kde4" != "no"])
AM_CONDITIONAL([QT_X11], [test "$platform" = "X11"])
AM_CONDITIONAL([QTOPIA], [test "$platform" = "Qtopia"])
AM_CONDITIONAL([QT_OSX], [test "$platform" = "OSX"])
@@ -2260,7 +2258,7 @@ fi
AM_CONDITIONAL(HAVE_GLIB, [ test x"${has_glib}" = xyes ])
if test x$npapi = xyes; then
- if ! test x$build_gtk = xyes -o x$build_kde4 = xyes; then
+ if ! test x$build_gtk = xyes -o x$build_qt4 = xyes; then
AC_MSG_WARN(["Enabled NPAPI plugin, but it's not supported by the selected
GUI"])
fi
fi
@@ -2294,7 +2292,7 @@ if test x$has_kde4 = xno -a x$build_kparts4 = xyes; then
AC_MSG_WARN(["Disabling KPARTS 4.x plugin, no KDE 4.x development found"])
fi
-if test x$build_kde4 = xno -a x$kparts4 = xyes; then
+if test x$build_qt4 = xno -a x$kparts4 = xyes; then
AC_MSG_WARN(["Enabled KPARTS 4.x plugin, but you aren't building a KDE 4.x
based GUI!"])
fi
@@ -2305,10 +2303,10 @@ dnl Drop these conditionals ?
AM_CONDITIONAL(BUILD_QT3_GUI,
[ test x"${build_kde3}" = xyes -o x"${build_qtopia3}" = xyes ])
AM_CONDITIONAL(BUILD_QT4_GUI,
- [ test x"${build_kde4}" = xyes -o x"${build_qtopia4}" = xyes ])
+ [ test x"${build_qt4}" = xyes -o x"${build_qtopia4}" = xyes ])
AM_CONDITIONAL(BUILD_KDE3_GUI, [ test x$build_kde3 = xyes ])
-AM_CONDITIONAL(BUILD_KDE4_GUI, [ test x$build_kde4 = xyes ])
+AM_CONDITIONAL(BUILD_QT4_GUI, [ test x$build_qt4 = xyes ])
AM_CONDITIONAL(BUILD_GTK_GUI, [ test x$build_gtk = xyes ])
AM_CONDITIONAL(BUILD_FLTK_GUI, [ test x$build_fltk = xyes ])
@@ -2718,7 +2716,7 @@ fi
if test x$build_kde3 = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},kde3"
fi
-if test x$build_kde4 = xyes; then
+if test x$build_qt4 = xyes; then
SUPPORTED_GUIS="${SUPPORTED_GUIS},kde4"
fi
if test x$build_gtk = xyes; then
@@ -2899,7 +2897,7 @@ if test x"${build_kde3}" = xyes -o x"${build_qtopia3}" =
xyes; then
fi
dnl Dump QT4 options is the user specified a QTOPIA4 or KDE4 GUI
-if test x"${build_kde4}" = xyes -o x"${build_qtopia4}" = xyes; then
+if test x"${build_qt4}" = xyes -o x"${build_qtopia4}" = xyes; then
if test x"${has_qt4}" = xyes; then
echo " QT4 flags are: ${QT4_CFLAGS}"
echo " QT4 libs are: ${QT4_LIBS}"
@@ -2911,6 +2909,20 @@ if test x"${build_kde4}" = xyes -o x"${build_qtopia4}" =
xyes; then
fi
fi
+if test x"${build_kparts4}" = xyes; then
+ if test x"${has_kde4}" = xyes; then
+ echo " KDE4 flags are: ${KDE4_CFLAGS}"
+ echo " KDE4 libs are: ${KDE4_LIBS}"
+ else
+ echo " kparts4 plugin is disabled"
+ echo " To enable the KDE 4.x gui," >&3
+ echo " install version 4.x of the KDE development
environment" >&3
+ echo " from http://kde.org"; >&3
+ echo " or .deb users: apt-get install kdelibs5-dev" >&3
+ echo " or .rpm users: yum install kdelibs-devel." >&3
+ fi
+fi
+
if test x"$build_qtopia3" = xyes; then
if test x"${QTOPIA3_LIBS}" != x ; then
if test x"${QTOPIA3_CFLAGS}" != x ; then
@@ -2961,25 +2973,6 @@ if test x$build_kde3 = xyes; then
fi
fi
-# -o x$build_kparts4 = xyes
-if test x$build_kde4 = xyes; then
- if test x"$has_kde4" = xyes; then
- echo " KDE 4.x flags are: $KDE4_CFLAGS"
- echo " KDE 4.x libs are: $KDE4_LIBS"
- else
- echo " ERROR: No KDE 4.x development package installed!" >&3
- echo " To disable the KDE 4.x gui," >&3
- echo " reconfigure using --enable-gui=<list-of-guis>" >&3
- echo " and omit "kde4" from the list" >&3
- echo " or avoid --enable-gui=... as a whole." >&3
- echo " To be able to build the kde 4.x gui," >&3
- echo " install version 4.x of the KDE development
environment" >&3
- echo " from http://kde.org"; >&3
- echo " or .deb users: apt-get install kdelibs5-dev" >&3
- echo " or .rpm users: yum install kdelibs-devel." >&3
- fi
-fi
-
if test x"${JPEG_LIBS}" != x ; then
if test x"${JPEG_CFLAGS}" != x ; then
echo " JPEG flags are: $JPEG_CFLAGS"
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index 0d08120..f51f849 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -21,7 +21,7 @@ icons32_DATA += ../packaging/gnash.xpm
bin_SCRIPTS += gnash-gtk-launcher
endif
-if BUILD_KDE4_GUI
+if BUILD_QT4_GUI
desktop_DATA += klash.desktop
icons32_DATA += ../packaging/klash.xpm
bin_SCRIPTS += gnash-qt-launcher
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 6bd387e..d99c3c5 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -131,7 +131,7 @@ if BUILD_GTK_GUI
EXTRAMANPAGES += gtk-gnash.1 gnash-gtk-launcher.1
endif
-if BUILD_KDE4_GUI
+if BUILD_QT4_GUI
EXTRAMANPAGES += kde4-gnash.1 gnash-qt-launcher.1
endif
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 3be4e83..98884c4 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -206,7 +206,7 @@ include $(srcdir)/kde/kde3.am
endif
# Build the KDE4 gui
-if BUILD_KDE4_GUI
+if BUILD_QT4_GUI
BUILT_SOURCES += Kde4Gui.moc
BUILT_SOURCES += Kde4Glue.moc
include $(srcdir)/kde/kde4.am
diff --git a/gui/kde/kde4.am b/gui/kde/kde4.am
index 27d5f60..859afd5 100644
--- a/gui/kde/kde4.am
+++ b/gui/kde/kde4.am
@@ -18,7 +18,7 @@
#
# Build the KDE gui
#
-if BUILD_KDE4_GUI
+if BUILD_QT4_GUI
Kde4Gui.moc: $(srcdir)/kde/Kde4Gui.h
@if test x"$(MOC4)" != x; then \
@@ -49,7 +49,7 @@ kde4_gnash_SOURCES = $(GUI_SRCS) \
kde/Kde4Gui.h \
kde/Kde4Glue.h
-kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS)
$(KDE4_CFLAGS) $(QT4_CFLAGS)
+kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS)
$(QT4_CFLAGS)
kde4_gnash_LDFLAGS = -export-dynamic
kde4_gnash_LDADD = \
$(MYSQL_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=5d96a868950ddc4fc018248c2dca0fb0bb0a96ce
commit 5d96a868950ddc4fc018248c2dca0fb0bb0a96ce
Author: Benjamin Wolsey <address@hidden>
Date: Tue Mar 22 13:58:38 2011 +0100
Implement screenDPI() in Qt4.
diff --git a/gui/kde/Kde4Glue.h b/gui/kde/Kde4Glue.h
index aabe74d..6449c66 100644
--- a/gui/kde/Kde4Glue.h
+++ b/gui/kde/Kde4Glue.h
@@ -29,14 +29,14 @@
class QRect;
class QGLWidget;
+
namespace gnash {
class Renderer;
class DrawingWidget;
class Kde4Gui;
}
-namespace gnash
-{
+namespace gnash {
class DrawingWidget : public QWidget
{
diff --git a/gui/kde/Kde4Gui.cpp b/gui/kde/Kde4Gui.cpp
index cd8dd3e..6cb34ce 100644
--- a/gui/kde/Kde4Gui.cpp
+++ b/gui/kde/Kde4Gui.cpp
@@ -361,6 +361,14 @@ Kde4Gui::unsetFullscreen()
}
}
}
+
+double
+Kde4Gui::getScreenDPI() const
+{
+ assert(_drawingWidget);
+ // Should this be logical or physical DPI?
+ return _drawingWidget->logicalDpiX();
+}
std::pair<int, int>
Kde4Gui::screenResolution() const
diff --git a/gui/kde/Kde4Gui.h b/gui/kde/Kde4Gui.h
index 1a75a15..cf954e8 100644
--- a/gui/kde/Kde4Gui.h
+++ b/gui/kde/Kde4Gui.h
@@ -102,6 +102,7 @@ public:
virtual void unsetFullscreen();
virtual void setClipboard(const std::string& copy);
virtual std::pair<int, int> screenResolution() const;
+ virtual double getScreenDPI() const;
void setInvalidatedRegions(const InvalidatedRanges& ranges);
void resize(int width, int height);
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 10 +++---
configure.ac | 77 +++++++++++++++++++++++---------------------------
desktop/Makefile.am | 2 +-
doc/C/Makefile.am | 2 +-
gui/Makefile.am | 2 +-
gui/kde/Kde4Glue.h | 4 +-
gui/kde/Kde4Gui.cpp | 8 +++++
gui/kde/Kde4Gui.h | 1 +
gui/kde/kde4.am | 4 +-
9 files changed, 56 insertions(+), 54 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-323-g66632d8,
Benjamin Wolsey <=