diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 08:31:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 08:31:55 +0100 |
| commit | 2550ec1cbeaf1c0cfa14d996763c14c35304d205 (patch) | |
| tree | 21463082c61b0d96fc87bba8319cffaf02b6e691 | |
| parent | ea2f8a119986979465d3679b9c03469ed529d4f6 (diff) | |
| parent | d08c5e0f9a29a09be05d34e6f67afea5cee1fc96 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I246933c28cb401fbec5e6469ae31807453190be3
| -rw-r--r-- | src/enginio_client/doc/qtenginio.qdocconf | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/doc/qtenginioqml.qdocconf | 5 | ||||
| -rw-r--r-- | src/enginio_plugin/enginio_plugin.pro | 13 |
3 files changed, 4 insertions, 16 deletions
diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf index c9037be..aa9b3b4 100644 --- a/src/enginio_client/doc/qtenginio.qdocconf +++ b/src/enginio_client/doc/qtenginio.qdocconf @@ -21,7 +21,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = enginio/widgets +examplesinstallpath = qtenginio/enginio/widgets depends += qtcore qtgui qtwidgets qtnetwork qtquick qtenginioqml qtenginiooverview diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf index 7546037..fb69034 100644 --- a/src/enginio_plugin/doc/qtenginioqml.qdocconf +++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf @@ -22,10 +22,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = enginio/quick - -# Add highlighting for QML Todo example -manifestmeta.highlighted.names += "QtEnginioQml/Enginio QML Examples - Todos" +examplesinstallpath = qtenginio/enginio/quick depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro index 728313f..e359ef3 100644 --- a/src/enginio_plugin/enginio_plugin.pro +++ b/src/enginio_plugin/enginio_plugin.pro @@ -9,7 +9,8 @@ QT = qml enginio enginio-private core-private QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf OTHER_FILES += \ doc/qtenginioqml.qdocconf \ - doc/enginio_plugin.qdoc + doc/enginio_plugin.qdoc \ + qmldir include(../src.pri) @@ -34,14 +35,4 @@ HEADERS += \ CONFIG += no_cxx_module load(qml_plugin) -QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir - -copy2build.input = QMLDIRFILE -copy2build.output = ../../qml/$${TARGET.module_name}/qmldir -!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS -copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build.name = COPY ${QMAKE_FILE_IN} -copy2build.CONFIG += no_link -force_independent: QMAKE_EXTRA_COMPILERS += copy2build - DEFINES += "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\"" |