diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
commit | 9e8daaed0466d760e047c5da58811e55e7807c0a (patch) | |
tree | eb75deaa8be7b1bbd777416aa1995990cd0f86a1 /examples/serialport | |
parent | 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 (diff) | |
parent | 9c9255eda50af191636ff9f18df35567c307dd8c (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I6a4c3e446633e6f142b87c268096b1bdc1598a62
Diffstat (limited to 'examples/serialport')
-rw-r--r-- | examples/serialport/blockingmaster/blockingmaster.pro | 3 | ||||
-rw-r--r-- | examples/serialport/blockingslave/blockingslave.pro | 3 | ||||
-rw-r--r-- | examples/serialport/cenumerator/cenumerator.pro | 3 | ||||
-rw-r--r-- | examples/serialport/creaderasync/creaderasync.pro | 3 | ||||
-rw-r--r-- | examples/serialport/creadersync/creadersync.pro | 3 | ||||
-rw-r--r-- | examples/serialport/cwriterasync/cwriterasync.pro | 3 | ||||
-rw-r--r-- | examples/serialport/cwritersync/cwritersync.pro | 3 | ||||
-rw-r--r-- | examples/serialport/enumerator/enumerator.pro | 3 | ||||
-rw-r--r-- | examples/serialport/master/master.pro | 3 | ||||
-rw-r--r-- | examples/serialport/serialport.pro | 3 | ||||
-rw-r--r-- | examples/serialport/slave/slave.pro | 3 | ||||
-rw-r--r-- | examples/serialport/terminal/terminal.pro | 3 |
12 files changed, 34 insertions, 2 deletions
diff --git a/examples/serialport/blockingmaster/blockingmaster.pro b/examples/serialport/blockingmaster/blockingmaster.pro index 8f3e0a15..7cf76d8b 100644 --- a/examples/serialport/blockingmaster/blockingmaster.pro +++ b/examples/serialport/blockingmaster/blockingmaster.pro @@ -11,3 +11,6 @@ SOURCES += \ main.cpp \ dialog.cpp \ masterthread.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/blockingmaster +INSTALLS += target diff --git a/examples/serialport/blockingslave/blockingslave.pro b/examples/serialport/blockingslave/blockingslave.pro index 2477b52c..11b9b80b 100644 --- a/examples/serialport/blockingslave/blockingslave.pro +++ b/examples/serialport/blockingslave/blockingslave.pro @@ -11,3 +11,6 @@ SOURCES += \ main.cpp \ dialog.cpp \ slavethread.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/blockingslave +INSTALLS += target diff --git a/examples/serialport/cenumerator/cenumerator.pro b/examples/serialport/cenumerator/cenumerator.pro index f5494fd7..75a43e36 100644 --- a/examples/serialport/cenumerator/cenumerator.pro +++ b/examples/serialport/cenumerator/cenumerator.pro @@ -9,3 +9,6 @@ TEMPLATE = app SOURCES += \ main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/cenumerator +INSTALLS += target diff --git a/examples/serialport/creaderasync/creaderasync.pro b/examples/serialport/creaderasync/creaderasync.pro index 3565dc9e..38d8b529 100644 --- a/examples/serialport/creaderasync/creaderasync.pro +++ b/examples/serialport/creaderasync/creaderasync.pro @@ -13,3 +13,6 @@ HEADERS += \ SOURCES += \ main.cpp \ serialportreader.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/creaderasync +INSTALLS += target diff --git a/examples/serialport/creadersync/creadersync.pro b/examples/serialport/creadersync/creadersync.pro index ee9eaf23..a2690aaf 100644 --- a/examples/serialport/creadersync/creadersync.pro +++ b/examples/serialport/creadersync/creadersync.pro @@ -9,3 +9,6 @@ TEMPLATE = app SOURCES += \ main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/creadersync +INSTALLS += target diff --git a/examples/serialport/cwriterasync/cwriterasync.pro b/examples/serialport/cwriterasync/cwriterasync.pro index 0945f1d4..f6105bc9 100644 --- a/examples/serialport/cwriterasync/cwriterasync.pro +++ b/examples/serialport/cwriterasync/cwriterasync.pro @@ -13,3 +13,6 @@ HEADERS += \ SOURCES += \ main.cpp \ serialportwriter.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/cwriterasync +INSTALLS += target diff --git a/examples/serialport/cwritersync/cwritersync.pro b/examples/serialport/cwritersync/cwritersync.pro index 08f50a28..1e0996dc 100644 --- a/examples/serialport/cwritersync/cwritersync.pro +++ b/examples/serialport/cwritersync/cwritersync.pro @@ -9,3 +9,6 @@ TEMPLATE = app SOURCES += \ main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/cwritersync +INSTALLS += target diff --git a/examples/serialport/enumerator/enumerator.pro b/examples/serialport/enumerator/enumerator.pro index 9819fd7d..3989335a 100644 --- a/examples/serialport/enumerator/enumerator.pro +++ b/examples/serialport/enumerator/enumerator.pro @@ -5,3 +5,6 @@ TEMPLATE = app SOURCES += \ main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/enumerator +INSTALLS += target diff --git a/examples/serialport/master/master.pro b/examples/serialport/master/master.pro index 977de6c7..354d1745 100644 --- a/examples/serialport/master/master.pro +++ b/examples/serialport/master/master.pro @@ -13,3 +13,6 @@ HEADERS += \ SOURCES += \ main.cpp \ dialog.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/master +INSTALLS += target diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro index c0e77dfd..6d00a225 100644 --- a/examples/serialport/serialport.pro +++ b/examples/serialport/serialport.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS = cenumerator creaderasync creadersync cwriterasync cwritersync -!isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave +!isEmpty(QT.widgets.name):SUBDIRS += enumerator terminal blockingmaster blockingslave master slave diff --git a/examples/serialport/slave/slave.pro b/examples/serialport/slave/slave.pro index df996ac1..54e7d027 100644 --- a/examples/serialport/slave/slave.pro +++ b/examples/serialport/slave/slave.pro @@ -13,3 +13,6 @@ HEADERS += \ SOURCES += \ main.cpp \ dialog.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/slave +INSTALLS += target diff --git a/examples/serialport/terminal/terminal.pro b/examples/serialport/terminal/terminal.pro index 1e45e557..4dbed02d 100644 --- a/examples/serialport/terminal/terminal.pro +++ b/examples/serialport/terminal/terminal.pro @@ -20,3 +20,6 @@ FORMS += \ RESOURCES += \ terminal.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/serialport/terminal +INSTALLS += target |