summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-05-03 00:09:57 +0200
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>2014-05-03 22:31:58 +0300
commit98ab258129a530c81c356705baffd1453deb646a (patch)
treeecc7d78412998db7d108d28dc7a670974e974004
parente0d6a07f779863cfa3ec47b4368b72fe0bb4f716 (diff)
s/0.10/1.0/g in places where it was forgotten (qml modules, docs and qmake project files)
-rw-r--r--examples/appsink-src/appsink-src.pro4
-rw-r--r--examples/player/player.pro4
-rw-r--r--examples/qmlplayer/qmlplayer.pro4
-rw-r--r--examples/qmlplayer/qmlplayer.qml2
-rw-r--r--examples/qmlplayer2/qmlplayer2.pro2
-rw-r--r--examples/qmlplayer2/qmlplayer2.qml2
-rw-r--r--examples/recorder/recorder.pro4
-rw-r--r--examples/voip/voip.pro4
-rw-r--r--src/QGst/Quick/videosurface.h2
-rw-r--r--src/QGst/Ui/graphicsvideosurface.h2
-rw-r--r--src/main.dox16
-rw-r--r--src/qml/quick1/plugin.cpp6
-rw-r--r--src/qml/quick2/plugin.cpp8
13 files changed, 30 insertions, 30 deletions
diff --git a/examples/appsink-src/appsink-src.pro b/examples/appsink-src/appsink-src.pro
index 2176b39..bcb048b 100644
--- a/examples/appsink-src/appsink-src.pro
+++ b/examples/appsink-src/appsink-src.pro
@@ -11,10 +11,10 @@ CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
contains(QT_VERSION, ^4\\..*) {
- PKGCONFIG += QtGStreamer-0.10 QtGStreamerUtils-0.10
+ PKGCONFIG += QtGStreamer-1.0 QtGStreamerUtils-1.0
}
contains(QT_VERSION, ^5\\..*) {
- PKGCONFIG += Qt5GStreamer-0.10 Qt5GStreamerUtils-0.10
+ PKGCONFIG += Qt5GStreamer-1.0 Qt5GStreamerUtils-1.0
}
# Recommended if you are using g++ 4.5 or later. Must be removed for other compilers.
diff --git a/examples/player/player.pro b/examples/player/player.pro
index 199afd1..8657abd 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -11,10 +11,10 @@ CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
contains(QT_VERSION, ^4\\..*) {
- PKGCONFIG += QtGStreamer-0.10 QtGStreamerUi-0.10
+ PKGCONFIG += QtGStreamer-1.0 QtGStreamerUi-1.0
}
contains(QT_VERSION, ^5\\..*) {
- PKGCONFIG += Qt5GStreamer-0.10 Qt5GStreamerUi-0.10
+ PKGCONFIG += Qt5GStreamer-1.0 Qt5GStreamerUi-1.0
QT += widgets
}
diff --git a/examples/qmlplayer/qmlplayer.pro b/examples/qmlplayer/qmlplayer.pro
index fa52049..2c7e8f8 100644
--- a/examples/qmlplayer/qmlplayer.pro
+++ b/examples/qmlplayer/qmlplayer.pro
@@ -11,10 +11,10 @@ CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
contains(QT_VERSION, ^4\\..*) {
- PKGCONFIG += QtGStreamer-0.10 QtGStreamerUi-0.10
+ PKGCONFIG += QtGStreamer-1.0 QtGStreamerUi-1.0
}
contains(QT_VERSION, ^5\\..*) {
- PKGCONFIG += Qt5GStreamer-0.10 Qt5GStreamerUi-0.10
+ PKGCONFIG += Qt5GStreamer-1.0 Qt5GStreamerUi-1.0
QT += widgets
}
diff --git a/examples/qmlplayer/qmlplayer.qml b/examples/qmlplayer/qmlplayer.qml
index e6f3216..cadc460 100644
--- a/examples/qmlplayer/qmlplayer.qml
+++ b/examples/qmlplayer/qmlplayer.qml
@@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 1.0
-import QtGStreamer 0.10
+import QtGStreamer 1.0
Rectangle {
id: window
diff --git a/examples/qmlplayer2/qmlplayer2.pro b/examples/qmlplayer2/qmlplayer2.pro
index ee858c0..d1afbce 100644
--- a/examples/qmlplayer2/qmlplayer2.pro
+++ b/examples/qmlplayer2/qmlplayer2.pro
@@ -10,7 +10,7 @@ CONFIG += silent
CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
-PKGCONFIG += QtGStreamer-0.10 QtGStreamerUi-0.10
+PKGCONFIG += QtGStreamer-1.0 QtGStreamerUi-1.0
# Recommended if you are using g++ 4.5 or later. Must be removed for other compilers.
#QMAKE_CXXFLAGS += -std=c++0x
diff --git a/examples/qmlplayer2/qmlplayer2.qml b/examples/qmlplayer2/qmlplayer2.qml
index 071096b..298fba4 100644
--- a/examples/qmlplayer2/qmlplayer2.qml
+++ b/examples/qmlplayer2/qmlplayer2.qml
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0
-import QtGStreamer 0.10
+import QtGStreamer 1.0
Rectangle {
id: window
diff --git a/examples/recorder/recorder.pro b/examples/recorder/recorder.pro
index c5d51bb..b012e98 100644
--- a/examples/recorder/recorder.pro
+++ b/examples/recorder/recorder.pro
@@ -11,10 +11,10 @@ CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
contains(QT_VERSION, ^4\\..*) {
- PKGCONFIG += QtGStreamer-0.10
+ PKGCONFIG += QtGStreamer-1.0
}
contains(QT_VERSION, ^5\\..*) {
- PKGCONFIG += Qt5GStreamer-0.10
+ PKGCONFIG += Qt5GStreamer-1.0
QT += widgets
}
diff --git a/examples/voip/voip.pro b/examples/voip/voip.pro
index 2d8ff03..50dfda7 100644
--- a/examples/voip/voip.pro
+++ b/examples/voip/voip.pro
@@ -11,10 +11,10 @@ CONFIG += link_pkgconfig
# Now tell qmake to link to QtGStreamer and also use its include path and Cflags.
contains(QT_VERSION, ^4\\..*) {
- PKGCONFIG += QtGStreamer-0.10 QtGStreamerUi-0.10
+ PKGCONFIG += QtGStreamer-1.0 QtGStreamerUi-1.0
}
contains(QT_VERSION, ^5\\..*) {
- PKGCONFIG += Qt5GStreamer-0.10 Qt5GStreamerUi-0.10
+ PKGCONFIG += Qt5GStreamer-1.0 Qt5GStreamerUi-1.0
QT += widgets
}
diff --git a/src/QGst/Quick/videosurface.h b/src/QGst/Quick/videosurface.h
index 8048e65..ef08015 100644
--- a/src/QGst/Quick/videosurface.h
+++ b/src/QGst/Quick/videosurface.h
@@ -42,7 +42,7 @@ class VideoSurfacePrivate;
* view->rootContext()->setContextProperty(QLatin1String("videoSurface"), surface);
* ...
* // and in your qml file:
- * import QtGStreamer 0.10
+ * import QtGStreamer 1.0
* ...
* VideoItem {
* id: video
diff --git a/src/QGst/Ui/graphicsvideosurface.h b/src/QGst/Ui/graphicsvideosurface.h
index 534c667..48d8db6 100644
--- a/src/QGst/Ui/graphicsvideosurface.h
+++ b/src/QGst/Ui/graphicsvideosurface.h
@@ -76,7 +76,7 @@ class GraphicsVideoSurfacePrivate;
* view->rootContext()->setContextProperty(QLatin1String("videoSurface"), surface);
* ...
* // and in your qml file:
- * import QtGStreamer 0.10
+ * import QtGStreamer 1.0
* ...
* VideoItem {
* id: video
diff --git a/src/main.dox b/src/main.dox
index 0d6a1b4..55568f9 100644
--- a/src/main.dox
+++ b/src/main.dox
@@ -85,22 +85,22 @@
*
* \code
* CONFIG += link_pkgconfig
- * PKGCONFIG += QtGStreamer-0.10
+ * PKGCONFIG += QtGStreamer-1.0
* \endcode
*
* In the PKGCONFIG variable you can set one or more of:
*
* \li QtGLib-2.0 - the libraries needed to use QtGLib
- * \li QtGStreamer-0.10 - the libraries needed to use QtGStreamer
- * \li QtGStreamerUi-0.10 - the libraries needed to use QtGStreamerUi
- * \li QtGStreamerUtils-0.10 - the libraries needed to use QtGStreamerUtils
+ * \li QtGStreamer-1.0 - the libraries needed to use QtGStreamer
+ * \li QtGStreamerUi-1.0 - the libraries needed to use QtGStreamerUi
+ * \li QtGStreamerUtils-1.0 - the libraries needed to use QtGStreamerUtils
*
* When QtGStreamer is built using Qt5, those packages are called differently:
*
* \li Qt5GLib-2.0
- * \li Qt5GStreamer-0.10
- * \li Qt5GStreamerUi-0.10
- * \li Qt5GStreamerUtils-0.10
+ * \li Qt5GStreamer-1.0
+ * \li Qt5GStreamerUi-1.0
+ * \li Qt5GStreamerUtils-1.0
*
* \section other_build_systems Other build systems
*
@@ -204,7 +204,7 @@
* on a QGraphicsView.
*
* If you are using QtQuick1, there is also a "VideoItem" element available when you import
- * "QtGStreamer 0.10". See the qmlplayer example for details.
+ * "QtGStreamer 1.0". See the qmlplayer example for details.
*
* \section qt5_support Qt5 support
*
diff --git a/src/qml/quick1/plugin.cpp b/src/qml/quick1/plugin.cpp
index abb01bd..6da8bfc 100644
--- a/src/qml/quick1/plugin.cpp
+++ b/src/qml/quick1/plugin.cpp
@@ -25,15 +25,15 @@
class QtGStreamerPlugin : public QDeclarativeExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.freedesktop.gstreamer.Qt5GStreamerQuick1-0.10")
+ Q_PLUGIN_METADATA(IID "org.freedesktop.gstreamer.Qt5GStreamerQuick1-1.0")
public:
void registerTypes(const char *uri);
};
void QtGStreamerPlugin::registerTypes(const char *uri)
{
- qmlRegisterType<VideoItem>(uri, 0, 10, "VideoItem");
- qmlRegisterUncreatableType<QGst::Ui::GraphicsVideoSurface>(uri, 0, 10, "GraphicsVideoSurface",
+ qmlRegisterType<VideoItem>(uri, 1, 0, "VideoItem");
+ qmlRegisterUncreatableType<QGst::Ui::GraphicsVideoSurface>(uri, 1, 0, "GraphicsVideoSurface",
QLatin1String("Creating a QGst::Ui::GraphicsVideoSurface from QML is not supported"));
}
diff --git a/src/qml/quick2/plugin.cpp b/src/qml/quick2/plugin.cpp
index 59fc0d9..8795f63 100644
--- a/src/qml/quick2/plugin.cpp
+++ b/src/qml/quick2/plugin.cpp
@@ -23,7 +23,7 @@
class QtGStreamerPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.freedesktop.gstreamer.QtGStreamerQuick2-0.10"
+ Q_PLUGIN_METADATA(IID "org.freedesktop.gstreamer.QtGStreamerQuick2-1.0"
FILE "QtGStreamerQuick2.json")
public:
virtual void registerTypes(const char *uri);
@@ -31,9 +31,9 @@ public:
void QtGStreamerPlugin::registerTypes(const char *uri)
{
- // @uri org.freedesktop.gstreamer.QtGStreamerQuick2-0.10
- qmlRegisterType<QGst::Quick::VideoItem>(uri, 0, 10, "VideoItem");
- qmlRegisterUncreatableType<QGst::Quick::VideoSurface>(uri, 0, 10, "VideoSurface",
+ // @uri org.freedesktop.gstreamer.QtGStreamerQuick2-1.0
+ qmlRegisterType<QGst::Quick::VideoItem>(uri, 1, 0, "VideoItem");
+ qmlRegisterUncreatableType<QGst::Quick::VideoSurface>(uri, 1, 0, "VideoSurface",
QLatin1String("Creating a QGst::Quick::VideoSurface from QML is not supported"));
}