diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-18 23:02:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-18 23:02:29 (GMT) |
| commit | edd574758bdc4223a3d38b0f5cd0e1f11c537b55 (patch) | |
| tree | a95fbee6c5efc127f1c069804f7d1d1d36c2d06a /src/declarative/qml/qdeclarativeimageprovider.cpp | |
| parent | afb304bc3de01262e183b7f9904493e3d898a744 (diff) | |
| parent | 8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5 (diff) | |
| download | Qt-edd574758bdc4223a3d38b0f5cd0e1f11c537b55.zip Qt-edd574758bdc4223a3d38b0f5cd0e1f11c537b55.tar.gz Qt-edd574758bdc4223a3d38b0f5cd0e1f11c537b55.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Use relative include instead of absolute in default qmake.conf
Fix waitForOpened not working with already active configuration
Diffstat (limited to 'src/declarative/qml/qdeclarativeimageprovider.cpp')
0 files changed, 0 insertions, 0 deletions