diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:08 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:33:08 +0100 |
commit | a2c3b32d08ed24279609a8c01b09c1147a9ff6b9 (patch) | |
tree | a338bf45761158d616df7e912d86144ee9abe300 /src/webchannel/webchannel.pro | |
parent | a9bad172f62fe1dda280df5477a8b7c1bd57690d (diff) | |
parent | 64a106da72796377bbff5cce0ecc5a379b105498 (diff) | |
download | qtwebchannel-a2c3b32d08ed24279609a8c01b09c1147a9ff6b9.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ifb2b9cc762b5c75f1ec3bf47c607906fdfef9bd1
Diffstat (limited to 'src/webchannel/webchannel.pro')
-rw-r--r-- | src/webchannel/webchannel.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index 931ee03..9c555e7 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -2,8 +2,6 @@ TARGET = QtWebChannel QT = core-private CONFIG += warn_on strict_flags -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtwebchannel.qdocconf RESOURCES += \ @@ -44,3 +42,5 @@ qtHaveModule(qml) { } HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) |