diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:58:09 +0100 |
| commit | 311be633d25f1f43c404cb5a2f2f2c3896c040bc (patch) | |
| tree | dc3da99566f7423801977978a4ded799123f331a | |
| parent | f34f10177c404a4ef757f6b2bdcfd0814ff28f06 (diff) | |
| parent | fc3413ec7639969cd66ccc17931a8eec4b89216b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I2ac62377ea3b053dea70d4ab706823c2113085e2
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 2 | ||||
| -rw-r--r-- | tests/auto/macfunctions/macfunctions.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 39faeee..00b45ac 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -7,7 +7,7 @@ version = $QT_VERSION exampledirs += ../../../examples/macextras \ snippets -examplesinstallpath = macextras +examplesinstallpath = qtmacextras/macextras # Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples manifestmeta.thumbnail.names += "QtMacExtras/*" diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro index 78b094f..b13227a 100644 --- a/tests/auto/macfunctions/macfunctions.pro +++ b/tests/auto/macfunctions/macfunctions.pro @@ -3,4 +3,4 @@ CONFIG -= app_bundle TARGET = tst_qmacfunctions QT += macextras widgets testlib OBJECTIVE_SOURCES += tst_qmacfunctions.mm -LIBS *= -framework AppKit +LIBS += -framework AppKit |