diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 23:29:40 +0200 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 23:29:40 +0200 |
commit | fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27 (patch) | |
tree | a21225293db6881174814290ad7298120c4a078b /examples/declarative/declarative.pro | |
parent | 37e8fd4e09c1221efde3e67e6acd5cfbb35686fd (diff) | |
parent | 23eb677daea8e084fcaa1256f1a9433e324b1474 (diff) | |
download | qt4-tools-fa5e912c80bc62c5bf53d3ddecc605a74b8c8e27.tar.gz |
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 Phonon compilation with a namespaced Qt.
Fix build on WinCE and Symbian: .pro file must match dir name.
Fix compilation on solaris-g++: ctype functions are sometimes macros
Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY
Diffstat (limited to 'examples/declarative/declarative.pro')
0 files changed, 0 insertions, 0 deletions