diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 09:46:19 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-19 09:46:19 (GMT) |
commit | 20befffe67104368f527bab871fec17c33d58977 (patch) | |
tree | 88c6e9541ecc4433abcb79197c8ecb720cbdefbd /demos/spectrum/app/spectrum.qrc | |
parent | d9e6c98c5cb39c7f6397a8015e1395e040135949 (diff) | |
parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
download | Qt-20befffe67104368f527bab871fec17c33d58977.zip Qt-20befffe67104368f527bab871fec17c33d58977.tar.gz Qt-20befffe67104368f527bab871fec17c33d58977.tar.bz2 |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
tools/assistant/tools/assistant/centralwidget.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
Diffstat (limited to 'demos/spectrum/app/spectrum.qrc')
-rw-r--r-- | demos/spectrum/app/spectrum.qrc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/demos/spectrum/app/spectrum.qrc b/demos/spectrum/app/spectrum.qrc new file mode 100644 index 0000000..6100479 --- /dev/null +++ b/demos/spectrum/app/spectrum.qrc @@ -0,0 +1,7 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>images/record.png</file> + <file>images/settings.png</file> +</qresource> +</RCC> + |