diff --git a/.qmake.conf b/.qmake.conf index 66245228bdf5c50fbfafa55a21ee0eec52b5e578..9f986403f3014e8e079bc86fdeafcbb839df77f9 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,6 @@ QMAKEPATH += $$PWD/tools/qmake load(qt_build_config) +CONFIG += qt_example_installs # All modules share the same version number. We plan on following Qt's releases for now. MODULE_VERSION = 5.2.0 diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro index aae724c55ecc52a76e333cdfe9bec9da49e70985..2c4ae9080268ed509bf8efd5055e033c5bf034cc 100644 --- a/examples/quick/quicknanobrowser/quicknanobrowser.pro +++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro @@ -17,3 +17,6 @@ QT_PRIVATE += quick-private gui-private core-private qtHaveModule(widgets) { QT += widgets # QApplication is required to get native styling with QtQuickControls } + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/quicknanobrowser +INSTALLS += target diff --git a/examples/widgets/browser/browser.pro b/examples/widgets/browser/browser.pro index c63602412c565e1db214a5460c66e85ae63c9c8a..050e9fa83c2a38eca717bdb046e0daf95b71e240 100644 --- a/examples/widgets/browser/browser.pro +++ b/examples/widgets/browser/browser.pro @@ -99,5 +99,5 @@ wince*: { EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc # install -target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/browser +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/browser INSTALLS += target diff --git a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro index c79d314c212f81114490284ef68ff44918f4fb1e..39963222d209215d29362f6407e9967a0845e521 100644 --- a/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro +++ b/examples/widgets/widgetsnanobrowser/widgetsnanobrowser.pro @@ -9,3 +9,5 @@ SOURCES = widgetwindow.cpp main.cpp RESOURCES += ../../common/common_resources.qrc QT += webenginewidgets + +CONFIG -= qt_example_installs