summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-26 07:52:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-26 07:52:38 (GMT)
commit65f5b6b4bb21c8d7062bbb950a5b4b53153d288f (patch)
tree93cfa1ae8fe232031db7b5ee9d7de262e04a93bd /src/gui/kernel/qapplication_p.h
parent9ff6bc28d5977bde97e8429328028e46572be445 (diff)
parentbd0258ed73ecee28fba4c21027b2c2afd1b6af39 (diff)
downloadQt-65f5b6b4bb21c8d7062bbb950a5b4b53153d288f.zip
Qt-65f5b6b4bb21c8d7062bbb950a5b4b53153d288f.tar.gz
Qt-65f5b6b4bb21c8d7062bbb950a5b4b53153d288f.tar.bz2
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Doc: Fix example code Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504 Accepting predicted text using hardware keyboard replaces unwanted part Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4 Workaround to VideoCore III scissor bug. Fix to QGLWidget crash Update def files Fix crash on exit when overriding signal handlers in states. Typo fix Add new signals to indicate GPU resource usage. symbian - search drives for translation files symbian - search drives for translation files Cannot flick to the end of a horizontal list view width LayoutMirroring Backport more imports directory caching changes. Symbian - fix deleteLater not working from RunL Fix more test DEPLOYMENT statements for Symbian Fix deployment for declarative tests, examples on Symbian Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2 Backport imports directory caching performance optimization
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
-rw-r--r--src/gui/kernel/qapplication_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 0756d6c..c4cb19c 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -564,6 +564,9 @@ public:
void symbianHandleLiteModeStartup();
void _q_aboutToQuit();
+
+ void emitAboutToReleaseGpuResources();
+ void emitAboutToUseGpuResources();
#endif
#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) || defined(Q_WS_QPA)
void sendSyntheticEnterLeave(QWidget *widget);