diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 10:29:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 10:29:22 (GMT) |
| commit | 345ea61326100c70328e4ff0783fd4c3ee8ae441 (patch) | |
| tree | c292f4042c40c3014cd1e3f102d93c307f3d9313 /src/opengl | |
| parent | 62a2fe9092d3b6038a08f5c5a7faa4a863b84fdc (diff) | |
| parent | c9533981e129655e2ca74b13ac1ff107df7db0e7 (diff) | |
| download | Qt-345ea61326100c70328e4ff0783fd4c3ee8ae441.zip Qt-345ea61326100c70328e4ff0783fd4c3ee8ae441.tar.gz Qt-345ea61326100c70328e4ff0783fd4c3ee8ae441.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: (22 commits)
ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions
Fix compilation
Code cleaning with the merge request 2286
Fix a pending issue with the merge request 2286
Doc: fix description of the expected behavior for QGraphicsItem::cursor
Fixed the build error in qtconfig
Resolved a little code style issue in qtconfig
Renamed controls in qtconfig's MainWindow
Removed inheritance from UI file in qtconfig's MainWindow
Fixed a bug and resolved some translation issues in qtconfig
Fixed some problems in qtconfig's PreviewWidget
Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced
Replaced the unnecessary include with declaration
Resolved some code style issues and fixed the broken copyright year
Finally removed the qtconfig dependency from qt3support
Modified previewwidget's ui file in qtconfig
Fixed some code style issues in qtconfig
Refactored the MainWindow in qtconfig
Refactored PaletteEditorAdvanced in qtconfig
Removed more legacy code from qtconfig and fixed codestyle issues
...
Diffstat (limited to 'src/opengl')
0 files changed, 0 insertions, 0 deletions