diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:47:20 +0200 |
| commit | ee0951d69b38f766e67262487be95b88501aa4a5 (patch) | |
| tree | 116c334060500be340d4d61c99026316b0df3ce9 /examples/xml/htmlinfo/resources.qrc | |
| parent | 0bb645b1ccc5a9d57b21cf0b2c4306b8e48c611c (diff) | |
| parent | d37239aa419ee4adff4b0a8d5c1403cadff72319 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qftp.cpp
src/widgets/itemviews/qheaderview.cpp
src/widgets/itemviews/qlistview.cpp
tests/auto/network/access/qftp/tst_qftp.cpp
Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9
Diffstat (limited to 'examples/xml/htmlinfo/resources.qrc')
| -rw-r--r-- | examples/xml/htmlinfo/resources.qrc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/xml/htmlinfo/resources.qrc b/examples/xml/htmlinfo/resources.qrc index a8cf88d57b..f427d9db10 100644 --- a/examples/xml/htmlinfo/resources.qrc +++ b/examples/xml/htmlinfo/resources.qrc @@ -1,7 +1,6 @@ <RCC> <qresource prefix="/"> <file>apache_org.html</file> - <file>nokia_com.html</file> <file>simpleexample.html</file> <file>trolltech_com.html</file> <file>w3c_org.html</file> |