diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-03-26 13:09:26 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-03-26 13:09:26 (GMT) |
| commit | c7d39e1335775979d43833d0b7f6c32cef898424 (patch) | |
| tree | f19716b0a3b29ebf91457586d5323fd6c77f1a23 /tests/auto/uic | |
| parent | 4fb6cae4dd0c6a90008780df606abb8a9e73cb2c (diff) | |
| download | Qt-c7d39e1335775979d43833d0b7f6c32cef898424.zip Qt-c7d39e1335775979d43833d0b7f6c32cef898424.tar.gz Qt-c7d39e1335775979d43833d0b7f6c32cef898424.tar.bz2 | |
uic3: -extract: Write XPM-images correctly.
Add magic header '/* XPM */' and turn off wrapping of lines that broke
image readers. Add a command line option to activate line-wrapping
in case someone exclusively wants to use the extracted images for
embedding in code. Also do line-wrapping in case images are embedded
into the ui-file.
Note: The current versions of MSVC do not seem to have a limitation of
line lengths any more.
Task-number: QTBUG-9207
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Diffstat (limited to 'tests/auto/uic')
| -rw-r--r-- | tests/auto/uic/baseline/config_fromuic3.ui.h | 1 | ||||
| -rw-r--r-- | tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h | 1 |
2 files changed, 2 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", diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h index 50cc4c8..40485ac 100644 --- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h +++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h @@ -439,6 +439,7 @@ protected: }; static QPixmap qt_get_icon(IconID id) { + /* XPM */ static const char* const image0_data[] = { "22 22 2 1", ". c None", |