From 5af27ed4ed16f823adf609e9790c864c55ed4ee9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 20:36:13 +0200 Subject: add example installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I50c0ad9c627129d8c4f988ba33722eb9a3d343be Reviewed-by: Morten Johan Sørvig --- examples/macextras/embeddedqwindow/embeddedqwindow.pro | 3 +++ examples/macextras/macfunctions/macfunctions.pro | 3 +++ examples/macextras/macpasteboardmime/macpasteboardmime.pro | 4 ++-- examples/macextras/mactoolbar/mactoolbar.pro | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/examples/macextras/embeddedqwindow/embeddedqwindow.pro b/examples/macextras/embeddedqwindow/embeddedqwindow.pro index 022a614..0180a40 100644 --- a/examples/macextras/embeddedqwindow/embeddedqwindow.pro +++ b/examples/macextras/embeddedqwindow/embeddedqwindow.pro @@ -7,3 +7,6 @@ LIBS += -framework Cocoa QT += gui widgets macextras QT += widgets-private gui-private core-private + +target.path = $$[QT_INSTALL_EXAMPLES]/macextras/embeddedqwindow +INSTALLS += target diff --git a/examples/macextras/macfunctions/macfunctions.pro b/examples/macextras/macfunctions/macfunctions.pro index 8d11880..0d3d931 100644 --- a/examples/macextras/macfunctions/macfunctions.pro +++ b/examples/macextras/macfunctions/macfunctions.pro @@ -9,3 +9,6 @@ SOURCES += main.cpp RESOURCES += \ macfunctions.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/macextras/macfunctions +INSTALLS += target diff --git a/examples/macextras/macpasteboardmime/macpasteboardmime.pro b/examples/macextras/macpasteboardmime/macpasteboardmime.pro index 3ce4cd4..65dcc05 100644 --- a/examples/macextras/macpasteboardmime/macpasteboardmime.pro +++ b/examples/macextras/macpasteboardmime/macpasteboardmime.pro @@ -2,5 +2,5 @@ QT += macextras widgets SOURCES += main.cpp - - +target.path = $$[QT_INSTALL_EXAMPLES]/macextras/macpasteboardmime +INSTALLS += target diff --git a/examples/macextras/mactoolbar/mactoolbar.pro b/examples/macextras/mactoolbar/mactoolbar.pro index 88d5cde..3e679fa 100644 --- a/examples/macextras/mactoolbar/mactoolbar.pro +++ b/examples/macextras/mactoolbar/mactoolbar.pro @@ -3,3 +3,6 @@ QT += macextras HEADERS += toolbarcontrollerwindow.h rasterwindow.h SOURCES += toolbarcontrollerwindow.cpp rasterwindow.cpp main.cpp RESOURCES += mactoolbar.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/macextras/mactoolbar +INSTALLS += target -- cgit v1.2.3 From 98948ff88515211554f482428a26e3ee45b53e18 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:27 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: I2b7019feee874946491ce887d8048e01ba68e0c9 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/macextras/doc/qtmacextras.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 00b45ac..39faeee 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 = qtmacextras/macextras +examplesinstallpath = macextras # Add a generic 'Qt Code Sample' thumbnail in Qt Creator for all examples manifestmeta.thumbnail.names += "QtMacExtras/*" -- cgit v1.2.3 From ae58e100d3df71772db4f2f938d0a2ddc8a0873f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:26:58 +0200 Subject: Bump version Change-Id: I46f4119408672fe424e9e134c35fdbb20d5d6b56 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index b642527..21c63db 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.3