diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 06:45:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 06:45:23 (GMT) |
commit | 4676dd62871da2b58452ebda477a04c25158bec4 (patch) | |
tree | 07347beee8f7258be45459b859307556d0e8f3ec /src/gui/egl/qeglproperties_p.h | |
parent | ec5120f85225a0bf732908e0890ff9d483a01870 (diff) | |
parent | dce762752b64be82c9592b4bed69101f4e7c9be2 (diff) | |
download | Qt-4676dd62871da2b58452ebda477a04c25158bec4.zip Qt-4676dd62871da2b58452ebda477a04c25158bec4.tar.gz Qt-4676dd62871da2b58452ebda477a04c25158bec4.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Some QWindowSurface implementations might implement flush as a buffer
Set EGL_SWAP_BEHAVIOR to EGL_BUFFER_PRESERVED for regular QWidgets
Cleanup & remove unused function overloads from QEgl* APIs
QScrollArea: Excessive scrolling in focusNextPrevChild()
Diffstat (limited to 'src/gui/egl/qeglproperties_p.h')
-rw-r--r-- | src/gui/egl/qeglproperties_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h index eebcf72..b1f9642 100644 --- a/src/gui/egl/qeglproperties_p.h +++ b/src/gui/egl/qeglproperties_p.h @@ -90,8 +90,6 @@ public: QString toString() const; - static void dumpAllConfigs(); - private: QVarLengthArray<int> props; }; |