diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:51:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:51:37 +0200 |
| commit | e2f08aaacb571c1287217b09acf66518ff924dc4 (patch) | |
| tree | 87cea42340eb474c1cf1a45c19e5fa2f4963a414 /src | |
| parent | 8e816f25034287bb3f89317a631075533914102b (diff) | |
| parent | 3dd2b06debd316e3656d433686642ffb64951c37 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I80957f4153719692cf2deede03ad09634c702fea
Diffstat (limited to 'src')
| -rw-r--r-- | src/winextras/doc/images/glass.png | bin | 47584 -> 47948 bytes | |||
| -rw-r--r-- | src/winextras/doc/images/peek-on.png | bin | 40988 -> 41574 bytes | |||
| -rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/winextras/doc/images/glass.png b/src/winextras/doc/images/glass.png Binary files differindex 513fe5d..a2a6326 100644 --- a/src/winextras/doc/images/glass.png +++ b/src/winextras/doc/images/glass.png diff --git a/src/winextras/doc/images/peek-on.png b/src/winextras/doc/images/peek-on.png Binary files differindex 2ad48e9..c655639 100644 --- a/src/winextras/doc/images/peek-on.png +++ b/src/winextras/doc/images/peek-on.png diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index 46c3e95..27b991a 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -7,7 +7,7 @@ version = $QT_VERSION exampledirs += ../../../examples/winextras \ snippets -examplesinstallpath = qtwinextras/winextras +examplesinstallpath = winextras headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras |
