diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:03:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:03:03 +0200 |
| commit | 4d28fcdb35a1412ce06f460227bf762bff8af892 (patch) | |
| tree | b12024e8c410d42772418b159e0c1a26790f6580 /src | |
| parent | e2b9c4ffea0838e2d5f25d7850f35a2a6d2a2ec0 (diff) | |
| parent | e2f08aaacb571c1287217b09acf66518ff924dc4 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ia50eff53661f7d699f7f2bc3710cc6643b9f434f
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 |
