| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
The patch was wrong. The new one is pushed into 4.6. The old one
is reverted to avoid merge conflicts.
This reverts commit a7ef2d899d711d750238a8d69284da808188b407.
|
|
|
|
|
|
| |
using pkg-config from pri file is not good for cross-compiling
Reviewed-by: paul
|
|
|
|
|
|
|
| |
After 03daf059647c0a0222e8774b0a083f58c8e64934, typedef of int are just
aliases to int, and therefor we need to use a real custom type for the test now
Reviewed-by: Thierry
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QMetaType::QVariant
After 03daf059647c0a0222e8774b0a083f58c8e64934
With the recent change in QMetaType, qRegisterMetaType<T> instantiates
QMetaTypeId2<T>, which itself instantiates QMetaTypeId<T> if T is not
builtin into QMetaType.
But qRegisterMetaType<QVariant> is called in qvariant.h which makes
further call to Q_DECLARE_METATYPE(QVariant) to fail as
QMetaTypeId<QVariant> would have been instantied before
The solution is to make QVariant a builtin type.
Reviewed-by: Thierry
|
|
|
|
| |
Task-number: QTBUG-8631
|
|
|
|
|
| |
Task-number: QTBUG-7411
Reviewed-by: ogoffart
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add and use QGLContextPrivate::eglSurfaceForDevice()
QMetaType: Now we can register typedefs.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QGLContext only stores the EGLSurface for QWidgets & QGLWidgets,
other device types like QPixmap & QGLPixelBuffer store the surface
themsselves. With this patch it is possible to create a QGLContext
on a QPixmap, make it current and render GL to that QPixmap on X11.
Reviewed-By: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-6833
Task-number: QTBUG-937
Reviewed-by: Brad
Reviewed-by: Kent Hansen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compile of some tests with `-qtnamespace'
Gstreamer media backend: ensure the null video output is not deleted
Use mute property instead of setting volume to 0 if playbin2 is used.
Gstreamer playback backend: Start loading media on setMedia(),
Fixed compiler warnings when compiling multimedia module.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
during player session lifetime
Reviewed-by: Andrew den Exter
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTMOBILITY-67
Reviewed-by: Andrew den Exter
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
without waiting for play() or pause().
To keep behaviour consisten with the rest of backends.
Reviewed-by: Andrew den Exter
|
| |\ \
|/ / /
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fixed compiler warnings when compiling multimedia module.
|
| | |
| | |
| | |
| | | |
Reviewed-by:Andrew den Exter
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix & move QEgl::native* to platform-specific files
Updates to changes file
Make bindTextureFromNativePixmap use new QEgl APIs
Move QGLWidget::setContext logic into QEgl & QGLContext
Move EGL surface type setting to new QEglProperties::setDeviceType
Replace qt_egl_add_platform_config with existing QEglProperties API
Use QEgl::display in QGLTemporaryContext so EGL is init'd only once
Remove qt_egl_setup_x11_visual
Make QGLWidget use new QEgl::getCompatibleVisualId API
Add QEglContext::configAttrib(int name) helper
Add getCompatibleVisualId to QEgl on X11
Add QEgl::defaultConfig method to select configs suitable for Qt
Make QEgl::createSurface cross-platform and add native getters
Move chooseConfig and createSurface logic to QEgl functions
Move static methods from QEglContext to QEgl namespace
Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
|
| | |
| | |
| | |
| | |
| | |
| | | |
This should fix build on Symbian & WinCE
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| |\ \
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make bindTextureFromNativePixmap use new QEgl APIs
Move QGLWidget::setContext logic into QEgl & QGLContext
Move EGL surface type setting to new QEglProperties::setDeviceType
Replace qt_egl_add_platform_config with existing QEglProperties API
Use QEgl::display in QGLTemporaryContext so EGL is init'd only once
Remove qt_egl_setup_x11_visual
Make QGLWidget use new QEgl::getCompatibleVisualId API
Add QEglContext::configAttrib(int name) helper
Add getCompatibleVisualId to QEgl on X11
Add QEgl::defaultConfig method to select configs suitable for Qt
Make QEgl::createSurface cross-platform and add native getters
Move chooseConfig and createSurface logic to QEgl functions
Move static methods from QEglContext to QEgl namespace
Move qegl_p.h -> qeglcontext_p.h and add a new qegl_p.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The old qt_chooseEGLConfigForPixmap & qt_createEGLSurfaceForPixmap
code will remain until QX11GLPixmapData can be re-written properly.
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QEgl::createSurface() on X11 will now check to see if the device's
X11 Visual is compatible with the EGLConfig passed in. If it is not
compatible, the function will re-create the QPaintDevice's native
drawable with a different Visual (one which is compatable with the
EGLConfig). This represented the bulk of the QGLWidget::setContext
method which is now much simpler.
As a consequense of this change, QWidgets with graphicssystem opengl
will behave much more like QGLWidget as most of the code is re-used.
So things like WA_TranslucentBackground should now work with opengl
graphicssystem too.
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also renamed qt_egl_set_format->qt_eglproperties_set_glformat
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QEglProperties::setPaintDeviceFormat() seems to be a copy & paste
of qt_egl_add_platform_config for every platform anyway.
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: Trond Kjernåsen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This method has been re-written as QEgl::getCompatibleVisualId()
which is much cleaner code.
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This method takes an EGLConfig and hands back an X11 VisualID which
can be used to create native windows/pixmaps which will have an EGL
surface created for them using the given EGL config.
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | | |
Reviewed-By: TrustMe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QEgl::createSurface was virtually identical for every platform apart
from the line which returned the native window type. This patch just
adds QEgl::nativePixmap and QEgl::nativeWindow which are platform
specific (though the default widget->winId() works for everything
apart from symbian).
Reviewed-By: Aleksandar Sasha Babic
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We keep the methods in QEglContext, but these are useful helpers
which wrap the QEgl version of the functions, which is where the
bulk of the logic is (for these functions anyway).
Reviewed-By: Aleksandar Sasha Babic
|
| | |
| | |
| | |
| | | |
Reviewed-By: Aleksandar Sasha Babic
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This puts the QEgl namespace in a single file which can be used by
both qeglcontext and qeglproperties. Files which need QEglContext
should now include qeglcontext_p.h.
Reviewed-By: Aleksandar Sasha Babic
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Fixed some qdoc errors.
qdoc: Second attempt, QML doc stuff.
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change caused a crash on several platforms before,
but not on mine, of course. It outputs a list of new
QML elements on the What's New in 4.7 page, and it
outputs the "Inherited by" list on each QML elemnent
page for elements that are inherited by other elements.
I can't see why it should crash anything, but I have
included some debug output. I think the crash might
have something to do with QList<T>, which qdoc3 uses
heavily. If it crashes for you, please get a stack
trace and the debug output.
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bearer management changes from Qt Mobility (fca9891).
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| | | |
| | | |
| | | |
| | | | |
fca98911b75ce12e70d93cfc2932a9759758a605
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
removed dead code
QMetaObject::invokeMethod: print a warning if the method is not found.
Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
removed dead code
QMetaObject::invokeMethod: print a warning if the method is not found.
Fixed qDrawPixmaps() to draw on integer coordinates on Mac OS X.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: denis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Also adapt QTestLib not to call invokeMethod on unexisting method to
avoid warnings
Task-number: QTBUG-7331
Reviewed-by: Brad
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is the 4.7 port of d04f5336f769d9e5d2f9105e1da4a7d23ea91795.
Task-number: related to QTBUG-8455
Reviewed-by: Kim
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
typo for windows ce exclusion rule
Updated .gitignore with the new name of the qmlviewer
Fixed the close button of the find widget in Assistant
Doc: brief Qt Quick introduction on "What's New" page.
Interview Demo: Fix warning about pixmap leak on X11.
Perform latin1 conversion directly on JSC::UString
Avoid conversion between JavaScriptCore String type and QString
Doc: Rephrase documentation for QColor::isValidColor and add \since 4.7.
Use QList::reserve() in QDataStream>>QList
Added static method isValidColor to QColor.
compile fix with namespaces
build fix for WinCE
qDetectCPUFeatures: compile fix with namespaces
compile fix for WinCE
Mac: using Qt to write plugins disables quit for 3rd party application
doc: Fixed building documentation
Updated syncqt to use relative include paths on cygwin as well.
|
| |\ \ \ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Done with Christian Kandeler.
|