summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-09-13Use QOpenGLContext instead of the QGLContextHEADmasterMathias Hasselmann6-21/+25
With Qt5 QGLContext is marked as "done". More importantly QtQuick2 is based upon the new QOpenGLContext. FIXME: For upstreaming this patch still needs quite some cleanups, like conditional complication guards. It also might make sense to introduce an additional "openglcontext" property, instead of changing the type of "glcontext". Additionally one also has to decide how to deal with all those (for our purposes unrelated) classes that depend on a QGLWidget internally.
2013-06-10cmake: Add QTGSTREAMER_FOUND in QtGStreamerConfig for compatibilityGeorge Kiagiadakis1-0/+4
2013-06-090.10.2.2 pre-releaseGeorge Kiagiadakis1-1/+1
2013-06-09Update NEWSGeorge Kiagiadakis1-0/+37
2013-06-09docs: Mention Qt5 support in the documentation and bring the README up-to-dateGeorge Kiagiadakis2-16/+41
2013-06-09cmake: Determine whether to use OpenGLES based on what Qt is using on the ↵George Kiagiadakis1-9/+21
target system This is needed since recent linux distributions sometimes ship both desktop GL and GLES on desktops and QtGStreamer fails to compile because it tries to use GLES although Qt is using GL.
2013-06-09FindQt4or5: fix compatibility with older cmakeGeorge Kiagiadakis1-2/+3
2013-06-09includes: Stop using <QtModule/QtClass> style includes outside of src/George Kiagiadakis29-142/+71
* Makes Qt4/Qt5 compatible source code easier to read and develop since no Qt version checking is needed for deciding which module a certain class lives in. * Code under src/ (libraries) should use the old style because the QtGStreamer headers need to work even if only the top-level Qt include dir is in the compiler's include path (when building projects that use QtGStreamer)
2013-06-09qml: Rename QtGStreamerQML to QtGStreamerQuick1 for less confusion and fix ↵George Kiagiadakis3-11/+18
its loading on windows
2013-06-09cmake: Improve QtGStreamerConfig.cmakeGeorge Kiagiadakis1-7/+40
* Honor QUIET * Fail when dependencies are not found, without using the nasty REQUIRED keyword * Unset useless variables when done * Do not require Qt5Widgets as a dependency
2013-06-09elements: Rename qtvideosink and its variants in Qt5 to make it parallel ↵George Kiagiadakis13-32/+81
installable * qtvideosink -> qt5videosink * qtglvideosink -> qt5glvideosink * qwidgetvideosink -> qwidget5videosink
2013-06-09examples: Fix make examples_distcheck with Qt5George Kiagiadakis7-9/+43
2013-06-09cmake: Replace QtHelpers by a better FindQt4or5 scriptGeorge Kiagiadakis23-175/+338
This script makes use of qt4_use_modules and qt5_use_modules, which allow us to get rid of QT_* variables in cmake code and also do things right by defining all the necessary include directories and required Qt defines as well as compiler flags. This also allows us to support both Qt4 and Qt5 in the examples when compiled standalone without much effort.
2013-06-07pkgconfig: add ${prefix} in all the path variables to make them correctGeorge Kiagiadakis4-8/+8
2013-06-07qt5: Fix library names in the .pc files and rename the .pc files tooGeorge Kiagiadakis5-11/+14
2013-06-07qt5: Stop using QWeakPointer as a QPointer in Qt4 builds to reduce #ifdefsGeorge Kiagiadakis3-14/+2
QPointer works fine in Qt4 too, although with a minor performance overhead. QWeakPointer was going to deprecate it, but in Qt5 QPointer was brought back to life and QWeakPointer no longer works as a QPointer replacement.
2013-06-07discoverertest: Fix variable scope problemGeorge Kiagiadakis1-5/+5
On Visual Studio, this doesn't work. Obviously VS doesn't allow defining a local variable in a loop with the same name as an existing variable in its parent scope.
2013-06-07discoverertest: Replace not keyword with !George Kiagiadakis1-13/+13
Visual studio refuses to recognize 'not' as a valid C++ keyword...
2013-06-07discoverertest: Fix compiler warning due to missing virtual destructorGeorge Kiagiadakis1-0/+2
2013-06-07discoverertest: skip async test on platforms that do not have a glib event loopGeorge Kiagiadakis2-0/+13
2013-06-07tests: fix urihandlertest on windowsGeorge Kiagiadakis1-1/+2
2013-06-07Rename signal.h to qglib_signal.h to avoid it being used instead of the ↵George Kiagiadakis8-8/+8
system's signal.h This is a problem that appears on windows builds
2013-06-07cmake: Improve installation dirs macrosGeorge Kiagiadakis11-31/+39
* Use GNUInstallDirs as a base * Install .dlls in $prefix/bin on windows * Install cmake config files in lib/cmake/<package> * Rename macros for readability
2013-06-07tests/compilation: Pass the TARGET_LINKER_FILE to the compilation testsGeorge Kiagiadakis1-2/+2
On linux it doesn't matter, but on windows the linker is picky. TARGET_FILE expands to the .dll, which is useless for the linker; it requires the .lib/.a file instead.
2013-06-07tests/compilation: Pass the cmake generator to the compilation testsGeorge Kiagiadakis2-0/+2
This is useful on windows, where the default generator is most likely not what we want
2013-06-07tests/compilation: don't link compilation tests with qtcoreGeorge Kiagiadakis1-1/+1
This fails with Qt5 because qtcore is imported as an external cmake target, which apparently doesn't work with try_compile(). Fortunately, we are not using QtCore in those tests.
2013-06-07tests/compilation: Fix the compilation tests to work without ↵George Kiagiadakis3-5/+9
FindQtGStreamer.cmake
2013-06-07qt5: Set QT_IMPORTS_DIR on qt5George Kiagiadakis1-0/+14
2013-06-05qt5: Fix the export macros to work with the Qt5* library namesGeorge Kiagiadakis4-4/+4
2013-06-05qt5: also port the qmlplayer exampleGeorge Kiagiadakis2-2/+10
2013-06-05cmake: Fix library variableGeorge Kiagiadakis1-1/+1
2013-06-05qt5: qtvideosink: Fix replacement of windowShownLuciana Fujii Pontello1-1/+1
qWaitForWindowShown has been deprecated in favor of qWaitForWindowExposed and not qWaitForWindowActive.
2013-06-05qt5: examples: Fix floating point exception in playerLuciana Fujii Pontello2-5/+5
QTime() in QT5 is different than QTime(0,0). The first won't produce a valid date, and can't be used in QTime.msecsTo and other methods that rely on a valid QTime, otherwise 0 will be returned.
2013-06-05qt5: objectstore: Fix refcount problem on Qt5 portLuciana Fujii Pontello1-1/+1
We should test if the value was already zero, and not try to unref it and then test.
2013-06-05qt5: Initial port to Qt5George Kiagiadakis19-36/+162
Based on patches by: Tiago Salem Herrmann <tiago.herrmann@canonical.com> Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Andoni Morales Alastruey <ylatuya@gmail.com> Luciana Fujii Pontello <luciana@fujii.eti.br>
2013-06-05qt5: Fix QtGStreamerConfig*.cmake to use qt5 when appropriateGeorge Kiagiadakis2-4/+17
2013-06-05qt5: Rename the libraries and the package when building with qt5George Kiagiadakis5-34/+43
This is to keep the libraries co-installable with the qt4 versions
2013-06-05qt5: Add conditional support for Qt5 in the build systemGeorge Kiagiadakis9-19/+104
Based on patches by: Andoni Morales Alastruey <ylatuya@gmail.com> Luciana Fujii Pontello <luciana@fujii.eti.br>
2013-05-23cmake: Use the new CMakePackageConfigHelpersGeorge Kiagiadakis5-136/+78
2013-05-23cmake: Use CMAKE_INCLUDE_CURRENT_DIRGeorge Kiagiadakis12-14/+15
This avoids including CMAKE_CURRENT_BINARY_DIR in nearly every subdirectory
2013-05-23cmake: Drop completely the optional automoc dependencyGeorge Kiagiadakis12-84/+28
Since we require cmake 2.8.9 now, there is no point.
2013-05-23cmake: bump version requirement to 2.8.9 to make use of ↵George Kiagiadakis1-1/+3
CMAKE_POSITION_INDEPENDENT_CODE CMAKE_POSITION_INDEPENDENT_CODE will tell the build system to automatically use -fPIC / -fPIE when appropriate.
2012-12-12discoverer: Document the requirement of a glib event loop for the async APIGeorge Kiagiadakis1-2/+4
2012-12-12discoverertest: Use ADL in QGlib::Value equality operators to make the test ↵George Kiagiadakis1-2/+6
work with clang
2012-12-12QGst: Update gen.cpp to include GST_TYPE_DISCOVERER_RESULT and include ↵George Kiagiadakis2-433/+437
pbutils-enumtypes.h to make it compile
2012-12-12cmake: Raise version requirement of gst-plugins-bad to 0.10.36 and make ↵George Kiagiadakis1-2/+2
pbutils required Needed for parts of the discoverer api
2012-12-12discoverer: operator<<: Pass by const referenceMurray Cumming2-4/+4
2012-12-12Moved Fraction debug helper to structs.hMurray Cumming2-6/+6
2012-12-12Move DiscovererResult to enums.hMurray Cumming2-9/+13
2012-12-12Remove unused boost includeMurray Cumming1-4/+0