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 | |
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
-rw-r--r-- | examples/webkitwidgets/browser/browser.pro | 4 | ||||
-rw-r--r-- | sync.profile | 16 |
2 files changed, 1 insertions, 19 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 diff --git a/sync.profile b/sync.profile index fd3db4d..6d035bc 100644 --- a/sync.profile +++ b/sync.profile @@ -1,16 +1,2 @@ -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtwebkit" => "", - "qtscript" => "", - "qtsvg" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", - "qttools" => "", +%modules = ( # path to module name map ); |