diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/jalv_qt4_meta.hpp | 92 | ||||
| -rw-r--r-- | wscript | 13 |
3 files changed, 13 insertions, 95 deletions
@@ -1,8 +1,9 @@ jalv (1.4.5) unstable; * Show newly saved presets in the preset menu + * Generate Qt moc nonsense at build time for broader compatibility - -- David Robillard <d@drobilla.net> Sun, 12 Jan 2014 14:53:36 -0500 + -- David Robillard <d@drobilla.net> Sun, 12 Jan 2014 18:50:11 -0500 jalv (1.4.4) stable; diff --git a/src/jalv_qt4_meta.hpp b/src/jalv_qt4_meta.hpp deleted file mode 100644 index f61fe16..0000000 --- a/src/jalv_qt4_meta.hpp +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'jalv_qt4.cpp' -** -** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'jalv_qt4.cpp' doesn't include <QObject>." -#elif Q_MOC_OUTPUT_REVISION != 63 -#error "This file was generated using the moc from 4.8.6. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_PresetAction[] = { - - // content: - 6, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 14, 13, 13, 13, 0x0a, - - 0 // eod -}; - -static const char qt_meta_stringdata_PresetAction[] = { - "PresetAction\0\0presetChosen()\0" -}; - -void PresetAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) -{ - if (_c == QMetaObject::InvokeMetaMethod) { - Q_ASSERT(staticMetaObject.cast(_o)); - PresetAction *_t = static_cast<PresetAction *>(_o); - switch (_id) { - case 0: _t->presetChosen(); break; - default: ; - } - } - Q_UNUSED(_a); -} - -const QMetaObjectExtraData PresetAction::staticMetaObjectExtraData = { - 0, qt_static_metacall -}; - -const QMetaObject PresetAction::staticMetaObject = { - { &QAction::staticMetaObject, qt_meta_stringdata_PresetAction, - qt_meta_data_PresetAction, &staticMetaObjectExtraData } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &PresetAction::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *PresetAction::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *PresetAction::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_PresetAction)) - return static_cast<void*>(const_cast< PresetAction*>(this)); - return QAction::qt_metacast(_clname); -} - -int PresetAction::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QAction::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 1) - qt_static_metacall(this, _c, _id, _a); - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE @@ -21,6 +21,9 @@ def options(opt): opt.add_option('--no-jack-session', action='store_true', default=False, dest='no_jack_session', help="Do not build JACK session support") + opt.add_option('--no-qt', action='store_true', default=False, + dest='no_qt', + help="Do not build Qt GUI") def configure(conf): conf.line_just = 52 @@ -49,8 +52,11 @@ def configure(conf): atleast_version='3.0.0', mandatory=False) autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM2', atleast_version='2.20.0', mandatory=False) - autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', - atleast_version='4.0.0', mandatory=False) + if not Options.options.no_qt: + autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', + atleast_version='4.0.0', mandatory=False) + if conf.is_defined('HAVE_QT4'): + conf.find_program('moc') conf.check(function_name='jack_port_type_get_buffer_size', header_name='jack/jack.h', @@ -120,6 +126,9 @@ def build(bld): # Qt version if bld.is_defined('HAVE_QT4'): + obj = bld(rule = '${MOC} ${SRC} > ${TGT}', + source = 'src/jalv_qt4.cpp', + target = 'jalv_qt4_meta.hpp') obj = bld(features = 'c cxx cxxprogram', source = source + ' src/jalv_qt4.cpp', target = 'jalv.qt', |