path: root/dist
diff options
authorKent Hansen <>2012-03-19 10:03:48 +0100
committerKent Hansen <>2012-03-19 10:03:48 +0100
commit95d6f8a4cf3fba2fd675f0e6b5de0ce1d702da26 (patch)
treea0bb36e478c97761afa36baf8026726b3d2fdbc8 /dist
parent3f64a7b67bfbcaab65ebb03f84962cce5834790b (diff)
parent25e004bfe493e18be255b057ae5c132a5ec5458b (diff)
Merge master into api_changes
Conflicts: src/corelib/tools/qvector.h tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I877256e95f3788e617437f4e9661a88047f38cd6
Diffstat (limited to 'dist')
1 files changed, 18 insertions, 10 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 0fd7cffb2f..0897d4937e 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -347,6 +347,16 @@ QtGui
information like capability flags, point-specific flags, velocity,
and raw positions.
+* A new set of enabler classes have been added, most importantly QWindow, QScreen,
+ QSurfaceFormat, and QOpenGLContext.
+* Most of the useful QtOpenGL classes have been polished and moved into
+ QtGui. See QOpenGLFramebufferObject, QOpenGLShaderProgram,
+ QOpenGLFunctions, etc.
+* QOpenGLPaintDevice has been added to be able to use QPainter to render into
+ the currently bound context.
* QInputContext removed as well as related getters and setters on QWidget and QApplication.
@@ -395,6 +405,11 @@ QtNetwork
+* Most of the classes in this module (with the notable exception of QGLWidget)
+ now have equivalents in QtGui, along with the naming change QGL -> QOpenGL.
+ The classes in QtOpenGL that have equivalents in QtGui can now be considered
+ deprecated.
@@ -555,10 +570,9 @@ Qt for Windows CE
- QPointer
- * QPointer itself is now deprecated, and the implementation of QPointer
- has been changed to use QWeakPointer. The old guard mechanism has been
- removed. This causes two slight changes in behavior when using
- QPointer:
+ * The implementation of QPointer has been changed to use QWeakPointer. The
+ old guard mechanism has been removed. This causes a slight change
+ in behavior when using QPointer:
* When using QPointer on a QWidget (or a subclass of QWidget), previously
the QPointer would be cleared by the QWidget destructor. Now, the QPointer
@@ -566,12 +580,6 @@ Qt for Windows CE
cleared). Any QPointers tracking a widget will NOT be cleared before the
QWidget destructor destroys the children for the widget being tracked.
- * When constructing a QSharedPointer to take ownership of an object after a
- QPointer is already tracking the object. Previously, the shared pointer
- construction would not be affected by the QPointer, but now that QPointer
- is implemented using QWeakPoiner, constructing the QSharedPointer will
- cause an abort().
- QVariant