diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-10-29 09:45:41 +0200 |
| commit | e3a4f132ca2a42af3d4bb889d6a17948b88d26a2 (patch) | |
| tree | 554d2b8b3020dc71438301aa696dea1e9a36943a /tests/surfacetest/surfacetest.qrc | |
| parent | cc50608385cf77a0803431ece1385f341a400b75 (diff) | |
| parent | bf716cfdf0afecccdb1f2eabb2e6a172c620fbff (diff) | |
Merge branch 'develop'
Conflicts:
.qmake.conf
README
src/datavisualization/global/qdatavisualizationglobal.h
Change-Id: Ia6941dcf3e6aa17e2e9ebc6f60fac16ef5049f11
Diffstat (limited to 'tests/surfacetest/surfacetest.qrc')
| -rw-r--r-- | tests/surfacetest/surfacetest.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/surfacetest/surfacetest.qrc b/tests/surfacetest/surfacetest.qrc index c18da2c4..266ed7e0 100644 --- a/tests/surfacetest/surfacetest.qrc +++ b/tests/surfacetest/surfacetest.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/maps"> <file alias="map">Heightmap.png</file> + <file alias="mapimage">mapimage.png</file> </qresource> </RCC> |