diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:41 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:41 +0100 |
| commit | 1490a408c4a360b92bf993e8a4c56cf96acd6033 (patch) | |
| tree | d573b969aef42cadae35d4a8309e0b7d7a5b17a1 /src | |
| parent | 1dcc307325260b02e46075bf230b3dd12236cc14 (diff) | |
| parent | df23cbf333978facc53185bbdf58219c74baf394 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I9ca4507914df98793d210d8fc7a466c9a14d5b53
Diffstat (limited to 'src')
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/macextras/qmacpasteboardmime.mm | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 1b0f4cd..e7690c5 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -10,6 +10,9 @@ exampledirs += ../../../examples/macextras \ examplesinstallpath = macextras +# Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples +manifestmeta.thumbnail.names += "QtMacExtras/*" + headerdirs = .. sourcedirs = .. imagedirs += images diff --git a/src/macextras/qmacpasteboardmime.mm b/src/macextras/qmacpasteboardmime.mm index edf8de6..3902bfb 100644 --- a/src/macextras/qmacpasteboardmime.mm +++ b/src/macextras/qmacpasteboardmime.mm @@ -132,6 +132,8 @@ void qRegisterDraggedTypes(const QStringList &types) */ QMacPasteboardMime::QMacPasteboardMime(char t) : type(t) { + Q_UNUSED(type); + QPlatformNativeInterface::NativeResourceForIntegrationFunction function = resolvePlatformFunction("addToMimeList"); if (function) { typedef void (*AddToGlobalMimeListFunction)(QMacPasteboardMime *); |