diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 16:33:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 16:33:29 (GMT) |
| commit | f19fcbd0d4d2af8773d40cddcba07fc06f2b9bf8 (patch) | |
| tree | c877b70f84d2f1a13deed7952eafb3b7105aa6b7 /tests/auto/uic/baseline/config_fromuic3.ui.h | |
| parent | 0373325dd1390682922dd07614214c453d473ce3 (diff) | |
| parent | 6b074cf855276f7ec67f7b69fe91f0243291c50d (diff) | |
| download | Qt-f19fcbd0d4d2af8773d40cddcba07fc06f2b9bf8.zip Qt-f19fcbd0d4d2af8773d40cddcba07fc06f2b9bf8.tar.gz Qt-f19fcbd0d4d2af8773d40cddcba07fc06f2b9bf8.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: (31 commits)
Fix compilation with Sun CC: no semi-colon after Q_ENUM.
Remove the "Insert unicode control character" menu entry on X11.
adds a timeout option to QThreadPool::waitForDone();
Remove leading whitespace from Qt header macros.
Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
Add QDateTime members that operate on 64-bit milliseconds.
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
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
...
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", |