summaryrefslogtreecommitdiff
path: root/ACE/bin
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2018-09-10 18:17:32 -0500
committerGitHub <noreply@github.com>2018-09-10 18:17:32 -0500
commitd8991068db5dfcb98a703323d7469da9615c43e2 (patch)
treecd771be6e385c3684cd20475e211ce98a7d2d818 /ACE/bin
parenta752608aaa76f8b0939918c920e47ec3ed5ea51f (diff)
parent06a00d6535256ddaf2f031d5521c095c3d3cf40e (diff)
downloadATCD-d8991068db5dfcb98a703323d7469da9615c43e2.tar.gz
Merge pull request #697 from mitza-oci/qt5
Qt5 support
Diffstat (limited to 'ACE/bin')
-rw-r--r--ACE/bin/MakeProjectCreator/config/ace_qt5.mpb4
-rw-r--r--ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb6
-rw-r--r--ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb7
3 files changed, 17 insertions, 0 deletions
diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb
new file mode 100644
index 00000000000..76d24e980d7
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ace_qt5.mpb
@@ -0,0 +1,4 @@
+// -*- MPC -*-
+project: qt5_gui {
+ macros += ACE_HAS_QT5
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
new file mode 100644
index 00000000000..4357a3779de
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+project : acelib, ace_qt5, qt5_widgets {
+ requires += ace_qt5reactor
+ after += ACE_Qt5Reactor
+ libs += ACE_QtReactor
+}
diff --git a/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb b/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb
new file mode 100644
index 00000000000..d25038af0e4
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/ace_qtreactor.mpb
@@ -0,0 +1,7 @@
+feature(qt4): ace_qt4reactor {
+}
+feature(qt5): ace_qt5reactor {
+}
+feature(!qt4, !qt5) {
+ requires += dummy_label
+}