diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
| commit | 5c32e4129e331a95187b65c2ab16074d21d8d96f (patch) | |
| tree | b86b6297b83f95860c7402b879e9b4691f485070 /tests/auto/uic | |
| parent | 1bb04f8c0675449a851cf636680951bd0a142507 (diff) | |
| parent | 5fd91a33ddfb9d8419eb7b3592087e9b5d15df58 (diff) | |
| download | Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.zip Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.gz Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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", |