diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 00:49:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 00:49:30 (GMT) |
| commit | 699491a8c7d9a7a2527c467e901f252f83733376 (patch) | |
| tree | 324a7df08f5e1dca54b811941d60cea9a7dfd928 /src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp | |
| parent | d30578f95dfec5c24626eb68ab05a489f12fcd03 (diff) | |
| parent | 9625c564877414695a9706acf34bc8719018ef06 (diff) | |
| download | Qt-699491a8c7d9a7a2527c467e901f252f83733376.zip Qt-699491a8c7d9a7a2527c467e901f252f83733376.tar.gz Qt-699491a8c7d9a7a2527c467e901f252f83733376.tar.bz2 | |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
Remove warnings
Fix Wayland plugin so it works with the wayland bind api
wayland: Track wayland changes
Support GL ES 2 with uikit.
Lighthouse: Fix virtual desktopwidget
Added missing function in QWaylandWindow.
wayland: Drop a debug qWarning()
wayland: Discard motion and button events receive with a NULL pointer focus
wayland: Include eglconvenience.pri instead of pulling in individual file
wayland: Remove unused EGLConfig field
wayland: Add native access interface for Wayland plugin
Compile fix for QPA's session manager.
Fixes compilation of wayland plugin after latest changes in wayland.
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface.cpp')
0 files changed, 0 insertions, 0 deletions