diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
| commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
| tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /tests/quicktestbrowser | |
| parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
| parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'tests/quicktestbrowser')
| -rw-r--r-- | tests/quicktestbrowser/resources.qrc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc index b1652852b..63ff051de 100644 --- a/tests/quicktestbrowser/resources.qrc +++ b/tests/quicktestbrowser/resources.qrc @@ -11,9 +11,9 @@ </qresource> <qresource prefix="icons"> <!-- To the risk of this breaking more often, do not duplicate the resources since this application won't be deployed --> - <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/go-next.png</file> - <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/go-previous.png</file> - <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/process-stop.png</file> - <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/view-refresh.png</file> + <file alias="go-next.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png</file> + <file alias="go-previous.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png</file> + <file alias="process-stop.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png</file> + <file alias="view-refresh.png">../../examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png</file> </qresource> </RCC> |