diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:59:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:59:59 +0100 |
| commit | 587887070f86743d90adcd29bfdd35464f922749 (patch) | |
| tree | e82c7c739652195fecb638a245679bc2d5ff91b6 /examples/webkitwidgets/browser/browser.pro | |
| parent | c858361fb202c201f8c45e2072d913dc7f31ec8e (diff) | |
| parent | ac8c2122bba9e2ba8887fb5586ca4a8a119cc404 (diff) | |
| download | qtwebkit-examples-587887070f86743d90adcd29bfdd35464f922749.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I1375cf9e30e33aad9bd856fcdca54f1b2c1fef49
Diffstat (limited to 'examples/webkitwidgets/browser/browser.pro')
| -rw-r--r-- | examples/webkitwidgets/browser/browser.pro | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/examples/webkitwidgets/browser/browser.pro b/examples/webkitwidgets/browser/browser.pro index 97559ed..caca413 100644 --- a/examples/webkitwidgets/browser/browser.pro +++ b/examples/webkitwidgets/browser/browser.pro @@ -89,10 +89,6 @@ mac { } } -wince*: { - DEPLOYMENT_PLUGIN += qjpeg qgif -} - EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc # install |