diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-23 21:51:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-23 21:51:17 +0200 |
| commit | 15090ec53621211616c4136ab37e0332c3ae709a (patch) | |
| tree | f0e156cafd8a478547037a079f25179b2c4a44d6 /src | |
| parent | 0f6e294fb8534f677a5ec75113679cfe24f559c1 (diff) | |
| parent | 5bddee78c2fe009610c982615d1d202399e464e8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: Ie164bbaaa8c78c13d75c85d0edcc2ea4d76fe738
Diffstat (limited to 'src')
| -rw-r--r-- | src/enginio_client/doc/qtenginio.qdocconf | 2 | ||||
| -rw-r--r-- | src/enginio_client/enginio_client.pro | 8 | ||||
| -rw-r--r-- | src/enginio_plugin/doc/qtenginioqml.qdocconf | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/enginio_client/doc/qtenginio.qdocconf b/src/enginio_client/doc/qtenginio.qdocconf index ff55798..c021df2 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 = qtenginio/enginio/widgets +examplesinstallpath = enginio/widgets depends += qtcore qtgui qtwidgets qtnetwork qtquick qtenginioqml qtenginiooverview diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index f3a158d..f53bde7 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -1,7 +1,8 @@ TARGET = Enginio +MODULE = enginio + QT = core-private network DEFINES += ENGINIOCLIENT_LIBRARY -MODULE = enginio QMAKE_DOCS = $$PWD/doc/qtenginio.qdocconf OTHER_FILES += \ @@ -10,8 +11,6 @@ OTHER_FILES += \ include(../src.pri) -load(qt_module) - SOURCES += \ enginiobackendconnection.cpp \ enginioclient.cpp \ @@ -43,5 +42,6 @@ HEADERS += \ enginiooauth2authentication.h \ enginioreplystate.h - DEFINES += "ENGINIO_VERSION=\\\"$$MODULE_VERSION\\\"" + +load(qt_module) diff --git a/src/enginio_plugin/doc/qtenginioqml.qdocconf b/src/enginio_plugin/doc/qtenginioqml.qdocconf index f887f9f..5d3f4c5 100644 --- a/src/enginio_plugin/doc/qtenginioqml.qdocconf +++ b/src/enginio_plugin/doc/qtenginioqml.qdocconf @@ -22,7 +22,7 @@ exampledirs += \ ../../../tests/auto \ # Specify example install dir under QT_INSTALL_EXAMPLES -examplesinstallpath = qtenginio/enginio/quick +examplesinstallpath = enginio/quick depends += qtcore qtgui qtnetwork qtqml qtquick qtquickcontrols qtenginio qtenginiooverview |