diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 13:16:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 13:16:59 (GMT) |
| commit | 7a48877fb523491dcf67aed2b17d497d76754180 (patch) | |
| tree | c5c454e9d53fd936b01ce4cd32b2598e0950fbc5 /tests/auto/uic/baseline/config_fromuic3.ui.h | |
| parent | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (diff) | |
| parent | ff968f44124322f5cda47cc7eced79ccaf23de80 (diff) | |
| download | Qt-7a48877fb523491dcf67aed2b17d497d76754180.zip Qt-7a48877fb523491dcf67aed2b17d497d76754180.tar.gz Qt-7a48877fb523491dcf67aed2b17d497d76754180.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: (24 commits)
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
QtScript: Add yet more missing API shims
...
Diffstat (limited to 'tests/auto/uic/baseline/config_fromuic3.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/config_fromuic3.ui.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/uic/baseline/config_fromuic3.ui.h b/tests/auto/uic/baseline/config_fromuic3.ui.h index c77b303..7e0189e 100644 --- a/tests/auto/uic/baseline/config_fromuic3.ui.h +++ b/tests/auto/uic/baseline/config_fromuic3.ui.h @@ -670,6 +670,7 @@ protected: }; static QPixmap qt_get_icon(IconID id) { + /* XPM */ static const char* const image0_data[] = { "22 22 2 1", ". c None", |