diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:22:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:22:30 +0200 |
| commit | 447947515df2cf727f14f5a1fdd4685ee8201e2f (patch) | |
| tree | 51f50094e55feaa7fb1347f7a19a8689c3a92b87 /src | |
| parent | 73ee37bebbf724a3ec01b30212ed31002a682083 (diff) | |
| parent | ceb1b32e0dba6d3826333f83e10eba50565dfe32 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I7c9a4153a0d93e531e5a881761fada2457cc3632
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index 2d41e63..09a48a3 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -4,8 +4,6 @@ project = ActiveQt description = ActiveQt version = $QT_VERSION -examplesinstallpath = qtactiveqt - qhp.projects = ActiveQt qhp.ActiveQt.file = activeqt.qhp |