diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-01 17:46:58 +0200 |
commit | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (patch) | |
tree | cbaa212790b49e024dae18ecbcead3bbf16a18cf /src/testlib | |
parent | 5b739a5b8cfbbedd9265b192d08b346d9b265590 (diff) | |
parent | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/global/qglobal.h
Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/doc/qttestlib.qdocconf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf index 35b4fbcb7b..0fafc733b1 100644 --- a/src/testlib/doc/qttestlib.qdocconf +++ b/src/testlib/doc/qttestlib.qdocconf @@ -40,5 +40,8 @@ excludedirs += ../../../examples/widgets/doc imagedirs += images +# Add a thumbnail for examples that do not have images +manifestmeta.thumbnail.names = "QtTestLib/Chapter *" + navigation.landingpage = "Qt Test" navigation.cppclassespage = "Qt Test C++ Classes" |