diff options
| author | mbrudka <mbrudka@a3e5c962-4219-0410-a828-e124f845ac39> | 2005-01-23 01:31:12 +0000 |
|---|---|---|
| committer | mbrudka <mbrudka@a3e5c962-4219-0410-a828-e124f845ac39> | 2005-01-23 01:31:12 +0000 |
| commit | 230baf8eca82cc8b1ac5ae2402d91ce0ff7e2028 (patch) | |
| tree | c754ce72ea95cb6d914ce6e87b7b90541cc703b9 | |
| parent | b0ce47cf495d2d219363d6f959fa65c65a7975df (diff) | |
| download | MPC-230baf8eca82cc8b1ac5ae2402d91ce0ff7e2028.tar.gz | |
ChangeLogTag: Sun Jan 23 01:54:59 2005 Marek Brudka <mbrudka@aster.pl>
| -rw-r--r-- | config/global.features | 5 | ||||
| -rw-r--r-- | config/qt.mpb | 21 | ||||
| -rw-r--r-- | config/qt_moc.mpb | 11 | ||||
| -rw-r--r-- | config/qt_uic.mpb | 10 |
4 files changed, 27 insertions, 20 deletions
diff --git a/config/global.features b/config/global.features index c7fa2bfb..4830c3fe 100644 --- a/config/global.features +++ b/config/global.features @@ -9,7 +9,10 @@ // want enabled or disabled. // 2) Create a feature file anywhere you like with the features you want and // use the -feature_file option to specify where it is located. - +// +// Feature definitions from this file are always overwritten by -features +// command option of mwc.pl. +// // By default we disable these. qt = 0 zlib = 0 diff --git a/config/qt.mpb b/config/qt.mpb index 414a1de9..9c7c468a 100644 --- a/config/qt.mpb +++ b/config/qt.mpb @@ -2,6 +2,7 @@ // $Id$ project { + requires += qt includes += $(QTDIR)/include libpaths += $(QTDIR)/lib macros += QT_THREAD_SUPPORT @@ -13,4 +14,24 @@ project { } else { lit_libs += qt-mt230nc } + + Define_Custom(UIC) { + automatic = 1 + command = $(QTDIR)/bin/uic + postcommand = $(QTDIR)/bin/uic -impl <%output_noext%>.h -o <%output_noext%>.cpp <%input%> + output_option = -o + inputext = .ui + header_outputext = .h + } + + Define_Custom(MOC) { + automatic = 0 + command = $(QTDIR)/bin/moc + output_option = -o + pch_postrule = 1 + inputext = .h + pre_extension = _moc + source_outputext = .cpp + } + } diff --git a/config/qt_moc.mpb b/config/qt_moc.mpb index 2dff6e61..88aaf8e0 100644 --- a/config/qt_moc.mpb +++ b/config/qt_moc.mpb @@ -1,14 +1,5 @@ // -*- MPC -*- // $Id$ - +// This file stays here for compatibility reasons project : qt { - Define_Custom(MOC) { - automatic = 0 - command = $(QTDIR)/bin/moc - output_option = -o - pch_postrule = 1 - inputext = .h - pre_extension = _moc - source_outputext = .cpp - } } diff --git a/config/qt_uic.mpb b/config/qt_uic.mpb index 64207631..88aaf8e0 100644 --- a/config/qt_uic.mpb +++ b/config/qt_uic.mpb @@ -1,13 +1,5 @@ // -*- MPC -*- // $Id$ - +// This file stays here for compatibility reasons project : qt { - Define_Custom(UIC) { - automatic = 1 - command = $(QTDIR)/bin/uic - postcommand = $(QTDIR)/bin/uic -impl <%input_noext%>.h -o <%input_noext%>.cpp <%input%> - output_option = -o - inputext = .ui - header_outputext = .h - } } |