From d110ff0c4431a134c0b0895f005ea2b1e45b8125 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:31:52 +0200 Subject: remove most pointless CONFIG+=ordered Change-Id: I3d0c3cc192c3da07dfcd59f64a7c61864fe20ad8 Reviewed-by: Denis Shienkov --- examples/serialport/serialport.pro | 1 - 1 file changed, 1 deletion(-) (limited to 'examples') diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro index c0e77df..a1819bf 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 -- cgit v1.2.1 From 8d8bdacaebf38d46ab59fb8e1c8ce0d31f4d71ac Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 11:37:35 +0200 Subject: add example installs Change-Id: Iadcc0afaae8a54f10a587f0b2f37db128d7ea02d Reviewed-by: Denis Shienkov --- examples/serialport/blockingmaster/blockingmaster.pro | 3 +++ examples/serialport/blockingslave/blockingslave.pro | 3 +++ examples/serialport/cenumerator/cenumerator.pro | 3 +++ examples/serialport/creaderasync/creaderasync.pro | 3 +++ examples/serialport/creadersync/creadersync.pro | 3 +++ examples/serialport/cwriterasync/cwriterasync.pro | 3 +++ examples/serialport/cwritersync/cwritersync.pro | 3 +++ examples/serialport/enumerator/enumerator.pro | 3 +++ examples/serialport/master/master.pro | 3 +++ examples/serialport/slave/slave.pro | 3 +++ examples/serialport/terminal/terminal.pro | 3 +++ 11 files changed, 33 insertions(+) (limited to 'examples') diff --git a/examples/serialport/blockingmaster/blockingmaster.pro b/examples/serialport/blockingmaster/blockingmaster.pro index 8f3e0a1..7cf76d8 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 2477b52..11b9b80 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 f5494fd..75a43e3 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 3565dc9..38d8b52 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 ee9eaf2..a2690aa 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 0945f1d..f6105bc 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 08f50a2..1e0996d 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 9819fd7..3989335 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 977de6c..354d174 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/slave/slave.pro b/examples/serialport/slave/slave.pro index df996ac..54e7d02 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 1e45e55..4dbed02 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 -- cgit v1.2.1 From 0f68acf35c745a6409d2c1559887fa888a7b06cd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:25:38 +0200 Subject: enable build of master and slave examples Change-Id: I0680e485a0c3ecde410a090204f192ece66fa6c4 Reviewed-by: Denis Shienkov --- examples/serialport/serialport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/serialport/serialport.pro b/examples/serialport/serialport.pro index a1819bf..6d00a22 100644 --- a/examples/serialport/serialport.pro +++ b/examples/serialport/serialport.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs 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 -- cgit v1.2.1