diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:28:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:28:01 +0200 |
| commit | 1a839b50564782feac2e5dd439686c2a0ed7d985 (patch) | |
| tree | 6122b8788de6791e51e3c860dfc9426ed83b9196 | |
| parent | c3e21b248a254a608a03fe9ab178d270625a962d (diff) | |
| parent | 1ac4ee240214a0e36b504fa1bcbc0c716d50620f (diff) | |
| download | qtwebkit-examples-1a839b50564782feac2e5dd439686c2a0ed7d985.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I22e2016526d410bd8e554975d9c04b2533d1ab4c
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | examples/webkitwidgets/imageanalyzer/imageanalyzer.pro | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index aa9ded0..aefa1e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.8.0 diff --git a/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro index 442a05f..e3ccda6 100644 --- a/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro +++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro @@ -11,4 +11,5 @@ RESOURCES = resources/imageanalyzer.qrc EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt - +target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/imageanalyzer +INSTALLS += target |