summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2011-01-07 13:30:20 +0200
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2011-01-07 13:30:20 +0200
commit7b095ac335638b95255e58b4b0de94c703d1a3dd (patch)
treec2eee50f86b4d4af68701b1772ae434e4fd79218
parent86725fc8d6475279d50ac0a86cd0271dc971ce83 (diff)
Fix branding: it's GStreamer, not Gstreamer.
Warning: This affects the library name and the cmake package name too.
-rw-r--r--CMakeLists.txt4
-rw-r--r--README70
-rw-r--r--cmake/modules/FindQtGStreamer.cmake (renamed from cmake/modules/FindQtGstreamer.cmake)52
-rw-r--r--codegen/generator.cpp2
-rw-r--r--elements/gstqwidgetvideosink.cpp2
-rw-r--r--examples/echo/CMakeLists.txt6
-rw-r--r--examples/echo/echo.pro12
-rw-r--r--examples/player/CMakeLists.txt6
-rw-r--r--examples/player/player.pro12
-rw-r--r--src/CMakeLists.txt42
-rw-r--r--src/QGlib/string_p.h2
-rw-r--r--src/QGst/objectstore_p.h2
-rw-r--r--src/main.dox6
-rw-r--r--tests/compilation/CompilationTests_CMakeLists.txt2
14 files changed, 110 insertions, 110 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2be409d..a227078 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(QtGstreamer)
+project(QtGStreamer)
cmake_minimum_required(VERSION 2.8)
enable_testing()
@@ -21,7 +21,7 @@ find_package(Boost)
macro_log_feature(Boost_FOUND "Boost" "Required for building QtGLib" "http://www.boost.org/" TRUE "1.40")
# this just sets the QTGSTREAMER_* cmake variables
-find_package(QtGstreamer REQUIRED)
+find_package(QtGStreamer REQUIRED)
find_package(Automoc4)
macro_log_feature(Automoc4_FOUND "Automoc 4" "Required for the build system to generate moc files properly"
diff --git a/README b/README
index 51fef23..ac3a14a 100644
--- a/README
+++ b/README
@@ -1,30 +1,30 @@
1. About
--------
-- What is QtGstreamer?
+- What is QtGStreamer?
-QtGstreamer aims to become a library providing C++ bindings for Gstreamer [1]
-with a Qt-style API plus some helper classes for integrating Gstreamer better
+QtGStreamer aims to become a library providing C++ bindings for GStreamer [1]
+with a Qt-style API plus some helper classes for integrating GStreamer better
in Qt [2] applications.
[1]. http://gstreamer.freedesktop.org/
[2]. http://qt.nokia.com/
-- What is QtGstreamer’s development state at the moment?
+- What is QtGStreamer’s development state at the moment?
-QtGstreamer is still under development, but might be suitable for simple uses.
+QtGStreamer is still under development, but might be suitable for simple uses.
However, note that there is no source or binary compatibility guarantee yet,
-so if you want to use QtGstreamer in your project, I would recommend to ship
+so if you want to use QtGStreamer in your project, I would recommend to ship
it with your sources and build it as a static library.
-- What are the differences between the C++ bindings of QtGstreamer and Gstreamermm?
+- What are the differences between the C++ bindings of QtGStreamer and GStreamermm?
- * QtGstreamer provides bindings that completely hide the Gstreamer ABI,
- so your application doesn’t need to link to Gstreamer itself.
- * QtGstreamer uses QtCore helper classes (QString, QList, etc..) where it can,
+ * QtGStreamer provides bindings that completely hide the GStreamer ABI,
+ so your application doesn’t need to link to GStreamer itself.
+ * QtGStreamer uses QtCore helper classes (QString, QList, etc..) where it can,
to ease integration with Qt.
- * QtGstreamer provides support for connecting arbitrary GObject signals to
- slots, while in Gstreamermm every signal needs to be defined in the bindings,
+ * QtGStreamer provides support for connecting arbitrary GObject signals to
+ slots, while in GStreamermm every signal needs to be defined in the bindings,
or else you need to use the C API for connecting it. This is especially useful
for connecting signals from element plugins, where their interface is unknown
at compile time.
@@ -36,7 +36,7 @@ it with your sources and build it as a static library.
2.1 Dependencies
----------------
-QtGstreamer requires the following software to be installed in order to build:
+QtGStreamer requires the following software to be installed in order to build:
* CMake 2.6 or later <http://www.cmake.org/>
* GStreamer 0.10.31 or later <http://gstreamer.freedesktop.org/>
With its dependencies:
@@ -51,10 +51,10 @@ QtGstreamer requires the following software to be installed in order to build:
------------
A decent compiler with proper support for advanced templates, including features
-such as partial template specialization, is required. QtGstreamer can also make
+such as partial template specialization, is required. QtGStreamer can also make
use of C++0x features (see below for details). A compiler supporting at least
some of them is recommended. Currently, only the GNU C++ compiler (g++) version
-4.3 or later is known to support all the features that QtGstreamer uses. However,
+4.3 or later is known to support all the features that QtGStreamer uses. However,
other compilers can be used too, but with some limitations.
C++0x features in use:
@@ -77,8 +77,8 @@ $ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/installation/prefix
$ make
$ make install
-The above commands will build and install QtGstreamer as a shared library.
-If you prefer to build QtGstreamer as a static library, pass the
+The above commands will build and install QtGStreamer as a shared library.
+If you prefer to build QtGStreamer as a static library, pass the
-DSTATIC_QTGSTREAMER=1 option to cmake, like that:
$ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/installation/prefix -DSTATIC_QTGSTREAMER=1
@@ -86,37 +86,37 @@ $ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/installation/prefix -DSTATIC_QTGSTREA
2.4 Generating documentation
----------------------------
-QtGstreamer uses doxygen for documentation. To generate the documentation you need
+QtGStreamer uses doxygen for documentation. To generate the documentation you need
to install doxygen and run "make doc" after you have run cmake. This will generate
the documentation in <builddir>/doc/html/.
-3. Using QtGstreamer
+3. Using QtGStreamer
--------------------
3.1. Build system integration
-----------------------------
-If you are using cmake as your build system, using QtGstreamer is quite easy.
+If you are using cmake as your build system, using QtGStreamer is quite easy.
You can just do:
- find_package(QtGstreamer)
+ find_package(QtGStreamer)
-which will find QtGstreamer and define the following variables:
+which will find QtGStreamer and define the following variables:
- QTGSTREAMER_FOUND - system has QtGstreamer
- QTGSTREAMER_INCLUDE_DIR - the QtGstreamer include directory
- QTGSTREAMER_INCLUDES - the include directories needed to use QtGstreamer
- QTGSTREAMER_LIBRARY - the QtGstreamer library
- QTGSTREAMER_LIBRARIES - the libraries needed to use QtGstreamer
- QTGSTREAMER_DEFINITIONS - definitions recommended for using QtGstreamer
- QTGSTREAMER_FLAGS - extra compiler switches recommended for using QtGstreamer
+ QTGSTREAMER_FOUND - system has QtGStreamer
+ QTGSTREAMER_INCLUDE_DIR - the QtGStreamer include directory
+ QTGSTREAMER_INCLUDES - the include directories needed to use QtGStreamer
+ QTGSTREAMER_LIBRARY - the QtGStreamer library
+ QTGSTREAMER_LIBRARIES - the libraries needed to use QtGStreamer
+ QTGSTREAMER_DEFINITIONS - definitions recommended for using QtGStreamer
+ QTGSTREAMER_FLAGS - extra compiler switches recommended for using QtGStreamer
-Take a look at the CMakeLists.txt of the QtGstreamer examples to see how to use them.
+Take a look at the CMakeLists.txt of the QtGStreamer examples to see how to use them.
Alternatively, if you are using qmake, you can manually set the required variables,
as demonstrated in the example qmake project files that you can find together with
-the QtGstreamer examples. Unfortunately qmake does not support dynamic detection
+the QtGStreamer examples. Unfortunately qmake does not support dynamic detection
of installed libraries, so those variables have to be set manually, or you will have
to write some wrapper "configure" script that generates a qmake project file. This
is quite painful, compared to cmake, thus cmake is recommended.
@@ -124,19 +124,19 @@ is quite painful, compared to cmake, thus cmake is recommended.
3.2. Headers
------------
-The correct way to include a certain QtGstreamer header for a class is to use
+The correct way to include a certain QtGStreamer header for a class is to use
the #include <namespace/class> syntax. For example: #include <QGst/Element>
All the other lowercase headers (which all end with .h) are considered private
and should not be used directly.
-4. Developing QtGstreamer
+4. Developing QtGStreamer
-------------------------
4.1. Coding style
-----------------
-QtGstreamer follows the kdelibs coding style:
+QtGStreamer follows the kdelibs coding style:
http://techbase.kde.org/Policies/Kdelibs_Coding_Style
@@ -172,7 +172,7 @@ becomes:
There are cases where this may not be followed:
1) Properties. Most property getters have a "get" prefix, for example,
-gst_object_get_name(). In QtGstreamer the "get" prefix is omitted, so this
+gst_object_get_name(). In QtGStreamer the "get" prefix is omitted, so this
becomes just name().
2) Overloaded members. In C there is no possibility to have two methods with
diff --git a/cmake/modules/FindQtGstreamer.cmake b/cmake/modules/FindQtGStreamer.cmake
index 624b9a5..0f84548 100644
--- a/cmake/modules/FindQtGstreamer.cmake
+++ b/cmake/modules/FindQtGStreamer.cmake
@@ -1,13 +1,13 @@
-# - Try to find QtGstreamer
+# - Try to find QtGStreamer
# Once done this will define
#
-# QTGSTREAMER_FOUND - system has QtGstreamer
-# QTGSTREAMER_INCLUDE_DIR - the QtGstreamer include directory
-# QTGSTREAMER_INCLUDES - the include directories needed to use QtGstreamer
-# QTGSTREAMER_LIBRARY - the QtGstreamer library
-# QTGSTREAMER_LIBRARIES - the libraries needed to use QtGstreamer
-# QTGSTREAMER_DEFINITIONS - definitions recommended for using QtGstreamer
-# QTGSTREAMER_FLAGS - extra compiler switches recommended for using QtGstreamer
+# QTGSTREAMER_FOUND - system has QtGStreamer
+# QTGSTREAMER_INCLUDE_DIR - the QtGStreamer include directory
+# QTGSTREAMER_INCLUDES - the include directories needed to use QtGStreamer
+# QTGSTREAMER_LIBRARY - the QtGStreamer library
+# QTGSTREAMER_LIBRARIES - the libraries needed to use QtGStreamer
+# QTGSTREAMER_DEFINITIONS - definitions recommended for using QtGStreamer
+# QTGSTREAMER_FLAGS - extra compiler switches recommended for using QtGStreamer
#
# Copyright (c) 2010, George Kiagiadakis <kiagiadakis.george@gmail.com>
#
@@ -15,48 +15,48 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-# if variables are already in cache or we are building QtGstreamer
+# if variables are already in cache or we are building QtGStreamer
if((QTGSTREAMER_LIBRARY AND QTGSTREAMER_INCLUDE_DIR) OR BUILDING_QTGSTREAMER)
- set(QtGstreamer_FIND_QUIETLY TRUE)
+ set(QtGStreamer_FIND_QUIETLY TRUE)
else()
- set(QtGstreamer_FIND_QUIETLY FALSE)
+ set(QtGStreamer_FIND_QUIETLY FALSE)
endif()
set(_QTGSTREAMER_LINK_TO_QT_REQUIRED FALSE)
if(BUILDING_QTGSTREAMER)
- set(QTGSTREAMER_LIBRARY QtGstreamer)
- set(QTGSTREAMER_UI_LIBRARY QtGstreamerUi)
+ set(QTGSTREAMER_LIBRARY QtGStreamer)
+ set(QTGSTREAMER_UI_LIBRARY QtGStreamerUi)
set(QTGSTREAMER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src)
else()
- # Attempt to find the generated QtGstreamerTargets.cmake in the same directory
+ # Attempt to find the generated QtGStreamerTargets.cmake in the same directory
get_filename_component(_QTGSTREAMER_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- find_file(_QTGSTREAMER_TARGETS_FILE QtGstreamerTargets.cmake PATHS ${_QTGSTREAMER_CONFIG_DIR} NO_DEFAULT_PATH)
+ find_file(_QTGSTREAMER_TARGETS_FILE QtGStreamerTargets.cmake PATHS ${_QTGSTREAMER_CONFIG_DIR} NO_DEFAULT_PATH)
if(NOT _QTGSTREAMER_TARGETS_FILE)
- # Targets file not found. Do a typical search for QtGstreamer.
+ # Targets file not found. Do a typical search for QtGStreamer.
# Normally, this path is never executed. It is just provided as a fallback in case something goes wrong.
- find_library(QTGSTREAMER_LIBRARY QtGstreamer
+ find_library(QTGSTREAMER_LIBRARY QtGStreamer
PATHS "${_QTGSTREAMER_CONFIG_DIR}/../../lib")
- find_library(QTGSTREAMER_UI_LIBRARY QtGstreamerUi
+ find_library(QTGSTREAMER_UI_LIBRARY QtGStreamerUi
PATHS "${_QTGSTREAMER_CONFIG_DIR}/../../lib")
find_path(QTGSTREAMER_INCLUDE_DIR QGst/global.h
PATHS "${_QTGSTREAMER_CONFIG_DIR}/../../include"
- PATH_SUFFIXES QtGstreamer)
+ PATH_SUFFIXES QtGStreamer)
set(_QTGSTREAMER_LINK_TO_QT_REQUIRED TRUE)
else()
- # Targets file found. Use imported QtGstreamer target and relative include path.
- # We assume that this file has been installed in $PREFIX/lib/QtGstreamer/,
- # so the include path should evaluate to $PREFIX/include/QtGstreamer
+ # Targets file found. Use imported QtGStreamer target and relative include path.
+ # We assume that this file has been installed in $PREFIX/lib/QtGStreamer/,
+ # so the include path should evaluate to $PREFIX/include/QtGStreamer
include(${_QTGSTREAMER_TARGETS_FILE})
- set(QTGSTREAMER_LIBRARY QtGstreamer)
- set(QTGSTREAMER_UI_LIBRARY QtGstreamerUi)
- get_filename_component(QTGSTREAMER_INCLUDE_DIR "${_QTGSTREAMER_CONFIG_DIR}/../../include/QtGstreamer" ABSOLUTE)
+ set(QTGSTREAMER_LIBRARY QtGStreamer)
+ set(QTGSTREAMER_UI_LIBRARY QtGStreamerUi)
+ get_filename_component(QTGSTREAMER_INCLUDE_DIR "${_QTGSTREAMER_CONFIG_DIR}/../../include/QtGStreamer" ABSOLUTE)
endif()
endif()
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QtGstreamer DEFAULT_MSG QTGSTREAMER_INCLUDE_DIR
+find_package_handle_standard_args(QtGStreamer DEFAULT_MSG QTGSTREAMER_INCLUDE_DIR
QTGSTREAMER_LIBRARY QTGSTREAMER_UI_LIBRARY)
if(QTGSTREAMER_FOUND)
diff --git a/codegen/generator.cpp b/codegen/generator.cpp
index d9474c8..596e03c 100644
--- a/codegen/generator.cpp
+++ b/codegen/generator.cpp
@@ -32,7 +32,7 @@ int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
QTextStream outStream(stdout);
- outStream << "// Autogenerated by the QtGstreamer helper code generator" << endl
+ outStream << "// Autogenerated by the QtGStreamer helper code generator" << endl
<< "#include <boost/static_assert.hpp>" << endl;
for (int i=1; i<argc; ++i) {
diff --git a/elements/gstqwidgetvideosink.cpp b/elements/gstqwidgetvideosink.cpp
index 9ac0d5d..8d521c8 100644
--- a/elements/gstqwidgetvideosink.cpp
+++ b/elements/gstqwidgetvideosink.cpp
@@ -637,7 +637,7 @@ GST_PLUGIN_DEFINE (
plugin_init,
"0.1", //plugin version
"LGPL",
- "QtGstreamer",
+ "QtGStreamer",
"http://gitorious.org/qtgstreamer"
)
diff --git a/examples/echo/CMakeLists.txt b/examples/echo/CMakeLists.txt
index 6009daf..07a4569 100644
--- a/examples/echo/CMakeLists.txt
+++ b/examples/echo/CMakeLists.txt
@@ -1,7 +1,7 @@
-# This file serves as an example of how to use cmake with QtGstreamer.
-# It can be used for building this example either in the QtGstreamer source tree or standalone.
+# This file serves as an example of how to use cmake with QtGStreamer.
+# It can be used for building this example either in the QtGStreamer source tree or standalone.
-find_package(QtGstreamer REQUIRED)
+find_package(QtGStreamer REQUIRED)
include_directories(${QTGSTREAMER_INCLUDES})
add_definitions(${QTGSTREAMER_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
diff --git a/examples/echo/echo.pro b/examples/echo/echo.pro
index 05ccbc3..fafd7e9 100644
--- a/examples/echo/echo.pro
+++ b/examples/echo/echo.pro
@@ -1,6 +1,6 @@
-# This is a qmake project file, provided as an example on how to use qmake with QtGstreamer.
+# This is a qmake project file, provided as an example on how to use qmake with QtGStreamer.
# There is nothing special about it, the only difference with a normal qmake project
-# is that you specify INCLUDEPATH and LIBS to point to QtGstreamer. Unfortunately, qmake
+# is that you specify INCLUDEPATH and LIBS to point to QtGStreamer. Unfortunately, qmake
# does not provide features like searching for libraries, so both the include path and the
# library path have to be typed manually here. It is recommended to use cmake instead,
# unless you have a reason to use qmake.
@@ -8,11 +8,11 @@
TEMPLATE = app
TARGET = echo
-# Change this to point to the location where the QtGstreamer headers are installed
-INCLUDEPATH += /usr/local/include/QtGstreamer
+# Change this to point to the location where the QtGStreamer headers are installed
+INCLUDEPATH += /usr/local/include/QtGStreamer
-# Change this to point to the location where the QtGstreamer library is installed
-LIBS += -L/usr/local/lib -lQtGstreamer
+# Change this to point to the location where the QtGStreamer library is installed
+LIBS += -L/usr/local/lib -lQtGStreamer
# Recommended if you are using g++ 4.3 or later. Must be removed for other compilers.
QMAKE_CXXFLAGS += -std=c++0x
diff --git a/examples/player/CMakeLists.txt b/examples/player/CMakeLists.txt
index 701ebfd..6fb9305 100644
--- a/examples/player/CMakeLists.txt
+++ b/examples/player/CMakeLists.txt
@@ -1,7 +1,7 @@
-# This file serves as an example of how to use cmake with QtGstreamer.
-# It can be used for building this example either in the QtGstreamer source tree or standalone.
+# This file serves as an example of how to use cmake with QtGStreamer.
+# It can be used for building this example either in the QtGStreamer source tree or standalone.
-find_package(QtGstreamer REQUIRED)
+find_package(QtGStreamer REQUIRED)
include_directories(${QTGSTREAMER_INCLUDES})
add_definitions(${QTGSTREAMER_DEFINITIONS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QTGSTREAMER_FLAGS}")
diff --git a/examples/player/player.pro b/examples/player/player.pro
index 39de21e..a3c544b 100644
--- a/examples/player/player.pro
+++ b/examples/player/player.pro
@@ -1,6 +1,6 @@
-# This is a qmake project file, provided as an example on how to use qmake with QtGstreamer.
+# This is a qmake project file, provided as an example on how to use qmake with QtGStreamer.
# There is nothing special about it, the only difference with a normal qmake project
-# is that you specify INCLUDEPATH and LIBS to point to QtGstreamer. Unfortunately, qmake
+# is that you specify INCLUDEPATH and LIBS to point to QtGStreamer. Unfortunately, qmake
# does not provide features like searching for libraries, so both the include path and the
# library path have to be typed manually here. It is recommended to use cmake instead,
# unless you have a reason to use qmake.
@@ -8,11 +8,11 @@
TEMPLATE = app
TARGET = player
-# Change this to point to the location where the QtGstreamer headers are installed
-INCLUDEPATH += /usr/local/include/QtGstreamer
+# Change this to point to the location where the QtGStreamer headers are installed
+INCLUDEPATH += /usr/local/include/QtGStreamer
-# Change this to point to the location where the QtGstreamer library is installed
-LIBS += -L/usr/local/lib -lQtGstreamer
+# Change this to point to the location where the QtGStreamer library is installed
+LIBS += -L/usr/local/lib -lQtGStreamer
# Recommended if you are using g++ 4.3 or later. Must be removed for other compilers.
QMAKE_CXXFLAGS += -std=c++0x
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff32b14..bcf0aa2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(QtGstreamer_SRCS
+set(QtGStreamer_SRCS
QGlib/quark.cpp
QGlib/type.cpp
QGlib/paramspec.cpp
@@ -41,7 +41,7 @@ set(QtGstreamer_SRCS
${CMAKE_CURRENT_BINARY_DIR}/gen.cpp
)
-set(QtGstreamerUi_SRCS
+set(QtGStreamerUi_SRCS
QGst/Ui/videowidget.cpp
)
@@ -157,45 +157,45 @@ add_custom_command(OUTPUT gen.cpp
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-# Build and link QtGstreamer
+# Build and link QtGStreamer
if(QTGSTREAMER_STATIC)
- automoc4_add_library(QtGstreamer STATIC ${QtGstreamer_SRCS})
+ automoc4_add_library(QtGStreamer STATIC ${QtGStreamer_SRCS})
else()
- automoc4_add_library(QtGstreamer SHARED ${QtGstreamer_SRCS})
+ automoc4_add_library(QtGStreamer SHARED ${QtGStreamer_SRCS})
endif()
-set_target_properties(QtGstreamer PROPERTIES SOVERSION ${QTGSTREAMER_SOVERSION}
+set_target_properties(QtGStreamer PROPERTIES SOVERSION ${QTGSTREAMER_SOVERSION}
VERSION ${QTGSTREAMER_VERSION})
-target_link_libraries(QtGstreamer ${QT_QTCORE_LIBRARY} ${GSTREAMER_LIBRARY}
+target_link_libraries(QtGStreamer ${QT_QTCORE_LIBRARY} ${GSTREAMER_LIBRARY}
${GSTREAMER_INTERFACES_LIBRARY} ${GOBJECT_LIBRARIES})
-target_link_libraries(QtGstreamer LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY})
+target_link_libraries(QtGStreamer LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY})
-# Build and link QtGstreamerUi
+# Build and link QtGStreamerUi
if(QTGSTREAMER_STATIC)
- automoc4_add_library(QtGstreamerUi STATIC ${QtGstreamerUi_SRCS})
+ automoc4_add_library(QtGStreamerUi STATIC ${QtGStreamerUi_SRCS})
else()
- automoc4_add_library(QtGstreamerUi SHARED ${QtGstreamerUi_SRCS})
+ automoc4_add_library(QtGStreamerUi SHARED ${QtGStreamerUi_SRCS})
endif()
-set_target_properties(QtGstreamerUi PROPERTIES SOVERSION ${QTGSTREAMER_SOVERSION}
+set_target_properties(QtGStreamerUi PROPERTIES SOVERSION ${QTGSTREAMER_SOVERSION}
VERSION ${QTGSTREAMER_VERSION})
-target_link_libraries(QtGstreamerUi ${QT_QTGUI_LIBRARY} QtGstreamer)
-target_link_libraries(QtGstreamerUi LINK_INTERFACE_LIBRARIES ${QT_QTGUI_LIBRARY} QtGstreamer)
+target_link_libraries(QtGStreamerUi ${QT_QTGUI_LIBRARY} QtGStreamer)
+target_link_libraries(QtGStreamerUi LINK_INTERFACE_LIBRARIES ${QT_QTGUI_LIBRARY} QtGStreamer)
# Install the library
-install(TARGETS QtGstreamer DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT QtGstreamerTargets)
-install(TARGETS QtGstreamerUi DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT QtGstreamerTargets)
+install(TARGETS QtGStreamer DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT QtGStreamerTargets)
+install(TARGETS QtGStreamerUi DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT QtGStreamerTargets)
# Install the cmake scripts that are used to find the installed library from external projects
-install(EXPORT QtGstreamerTargets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/QtGstreamer)
-install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindQtGstreamer.cmake
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/QtGstreamer
- RENAME QtGstreamerConfig.cmake)
+install(EXPORT QtGStreamerTargets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/QtGStreamer)
+install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindQtGStreamer.cmake
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/QtGStreamer
+ RENAME QtGStreamerConfig.cmake)
# Install the headers
foreach(header ${INSTALLED_HEADERS})
get_filename_component(header_path ${header} PATH)
- install(FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/QtGstreamer/${header_path})
+ install(FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/QtGStreamer/${header_path})
endforeach(header ${INSTALLED_HEADERS})
diff --git a/src/QGlib/string_p.h b/src/QGlib/string_p.h
index 08a0094..a893c73 100644
--- a/src/QGlib/string_p.h
+++ b/src/QGlib/string_p.h
@@ -18,7 +18,7 @@
#include <glib.h>
/* WARNING: This header should only be included from
- * QtGstreamer source files and should not be installed */
+ * QtGStreamer source files and should not be installed */
namespace QGlib {
namespace Private {
diff --git a/src/QGst/objectstore_p.h b/src/QGst/objectstore_p.h
index afcaeba..af41ba9 100644
--- a/src/QGst/objectstore_p.h
+++ b/src/QGst/objectstore_p.h
@@ -19,7 +19,7 @@
#define QGST_OBJECTSTORE_H
/* WARNING: This header should only be included from
- * QtGstreamer source files and should not be installed */
+ * QtGStreamer source files and should not be installed */
namespace QGst {
namespace Private {
diff --git a/src/main.dox b/src/main.dox
index 3c03a58..62d60f2 100644
--- a/src/main.dox
+++ b/src/main.dox
@@ -1,7 +1,7 @@
-/*! \mainpage QtGstreamer API Reference
+/*! \mainpage QtGStreamer API Reference
*
* \section introduction Introduction
- * QtGstreamer provides C++ bindings for <a href="http://www.gstreamer.net">GStreamer</a>
+ * QtGStreamer provides C++ bindings for <a href="http://www.gstreamer.net">GStreamer</a>
* with a Qt-style API, plus some helper classes for integrating GStreamer better in
* <a href="http://qt.nokia.com">Qt</a> applications.
*/
@@ -75,5 +75,5 @@
*/
/*! \example player/main.cpp
- * This is an example audio player using QtGstreamer
+ * This is an example audio player using QtGStreamer
*/
diff --git a/tests/compilation/CompilationTests_CMakeLists.txt b/tests/compilation/CompilationTests_CMakeLists.txt
index 3077e3d..aa5b2bc 100644
--- a/tests/compilation/CompilationTests_CMakeLists.txt
+++ b/tests/compilation/CompilationTests_CMakeLists.txt
@@ -3,7 +3,7 @@
# the result of the whole test suite on the cmake exit status.
cmake_minimum_required(VERSION 2.8)
-find_package(QtGstreamer REQUIRED)
+find_package(QtGStreamer REQUIRED)
include(MacroCXXCompilationTest)
set(CMAKE_REQUIRED_LIBRARIES ${QTGSTREAMER_LIBRARIES})