diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:31:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:31:31 +0200 |
| commit | 0e526c1aa167ae81481ab3849dcc89f16ac55699 (patch) | |
| tree | 47f4caa06d500b55505314c49997c9b8407d7e83 /examples | |
| parent | 509c7b7f7da2fd69444b7dba32f31db51ad40aa8 (diff) | |
| parent | ae58e100d3df71772db4f2f938d0a2ddc8a0873f (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I2330fade4f257fc58a9906e98fc17da889ce62ea
Diffstat (limited to 'examples')
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 |