diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-01-20 09:46:15 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-01-20 09:46:15 +0100 |
| commit | 5dd8e9cdd4d6b9c8c936630ab49da5bcec4728a1 (patch) | |
| tree | d3611beb53779e18bb4ea55a4c346b09f50f8451 /tests/examples | |
| parent | 26e3c92093892729f6a3bd9d4a98d6291050c25a (diff) | |
examples: Port Qt examples to Qt5
Diffstat (limited to 'tests/examples')
| -rw-r--r-- | tests/examples/overlay/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/examples/overlay/qt-videooverlay.cpp | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am index f56935ba5..6bcdb8ffc 100644 --- a/tests/examples/overlay/Makefile.am +++ b/tests/examples/overlay/Makefile.am @@ -16,17 +16,17 @@ if HAVE_QT EXAMPLES += qt-videooverlay qt_videooverlay_SOURCES = qt-videooverlay.cpp -qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) +qt_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) -fPIC qt_videooverlay_LDADD = \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) endif -if HAVE_QT_GV +if HAVE_QT_MOC EXAMPLES += qtgv-videooverlay qtgv_videooverlay_SOURCES = qtgv-videooverlay.cpp qtgv-videooverlay.h -qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) +qtgv_videooverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS) -fPIC qtgv_videooverlay_LDADD = \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \ $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) @@ -36,11 +36,10 @@ qtgv_videooverlay_LDADD = \ nodist_qtgv_videooverlay_SOURCES = moc_qtgv-videooverlay.cpp moc_%.cpp:%.h - $(AM_V_GEN)$(QT4_MOC) $< -o $@ + $(AM_V_GEN)$(QT_MOC) $< -o $@ EXTRA_DIST = $(nodist_qtgv_videooverlay_SOURCES:moc_%.cpp=%.h) CLEANFILES = $(nodist_qtgv_videooverlay_SOURCES) - endif endif diff --git a/tests/examples/overlay/qt-videooverlay.cpp b/tests/examples/overlay/qt-videooverlay.cpp index 01449fcc9..b96466bc7 100644 --- a/tests/examples/overlay/qt-videooverlay.cpp +++ b/tests/examples/overlay/qt-videooverlay.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) { gst_init (&argc, &argv); QApplication app(argc, argv); - app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit ())); + app.setQuitOnLastWindowClosed(true); /* prepare the pipeline */ |