diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-10 14:36:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-10 14:36:38 (GMT) |
| commit | 8b05e2626de4d5a2dcc989c1521d387767f62388 (patch) | |
| tree | 3ee0653cbc99b48208bbb66c59f7ebd59f7779f2 /src/gui/widgets/qgroupbox.cpp | |
| parent | 7c5fe6297f8b2fe4a8f2939bee4e97d584bd682c (diff) | |
| parent | 58334dcd3bf7c65ff910f4b00f356aa5944f2c82 (diff) | |
| download | Qt-8b05e2626de4d5a2dcc989c1521d387767f62388.zip Qt-8b05e2626de4d5a2dcc989c1521d387767f62388.tar.gz Qt-8b05e2626de4d5a2dcc989c1521d387767f62388.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix path separator matching
fix -dont-process for mingw cross-build
fix nonsense condition
Don't include <features.h> directly: non-standard header.
Remove superfluous OpenGL linking for QtDeclarative
Diffstat (limited to 'src/gui/widgets/qgroupbox.cpp')
0 files changed, 0 insertions, 0 deletions