diff options
author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 14:00:11 (GMT) |
---|---|---|
committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 14:00:11 (GMT) |
commit | 8246896de49f2f2f5715d5986f415065aebd3e20 (patch) | |
tree | e1add6285a785c14d31dd7b96530d12c1fc6469d /tools | |
parent | 30cf45cf53e030158fef4dfb262e7444332d3138 (diff) | |
parent | b21639304b108de0697553f062eb36ccde6a5bd5 (diff) | |
download | Qt-8246896de49f2f2f5715d5986f415065aebd3e20.zip Qt-8246896de49f2f2f5715d5986f415065aebd3e20.tar.gz Qt-8246896de49f2f2f5715d5986f415065aebd3e20.tar.bz2 |
Merge branch '4.7-oslo1' into 4.7-doc
Diffstat (limited to 'tools')
-rw-r--r-- | tools/designer/src/components/formeditor/formeditor.qrc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/designer/src/components/formeditor/formeditor.qrc b/tools/designer/src/components/formeditor/formeditor.qrc index 6510814..42724dd 100644 --- a/tools/designer/src/components/formeditor/formeditor.qrc +++ b/tools/designer/src/components/formeditor/formeditor.qrc @@ -113,7 +113,6 @@ <file>images/widgets/vslider.png</file> <file>images/widgets/vspacer.png</file> <file>images/widgets/widget.png</file> - <file>images/widgets/widget.png</file> <file>images/widgets/widgetstack.png</file> <file>images/widgets/wizard.png</file> <file>images/win/adjustsize.png</file> |