On Fri, Oct 16, 2009 at 10:40 PM, Francis Galiegue <[email protected]> wrote: > This is the branch that I always compile against... I have git pulled > tonight, recompiled and since then I get this failure: > > ---- > [make] g++ -c -pipe -O2 -Wall -W -Wno-unused-function > -D_REENTRANT -fPIC -DQT_QTJAMBI_IMPORT -DQT_NO_DEBUG -DQT_CORE_LIB > -DQT_SHARED -I../../qt/mkspecs/linux-g++ -I. -I../../qt/include/QtCore > -I../../qt/include -I../qtjambi -I../common > -I/opt/sun-jdk-1.6.0.16/include -I/opt/sun-jdk-1.6.0.16/include/linux > -I. -I. -o metainfo.o ../cpp/com_trolltech_qt_core/metainfo.cpp > [make] ../cpp/com_trolltech_qt_core/metainfo.cpp: In function > ‘bool polymorphichandler_Lcom_trolltech_qt_core_QEvent_2(const void*, > char**, char**)’: > [...] > [make] ../cpp/com_trolltech_qt_core/metainfo.cpp:1029: error: > ‘Signal’ is not a member of ‘QEvent’ > [make] ../cpp/com_trolltech_qt_core/metainfo.cpp:1030: warning: > deprecated conversion from string constant to ‘char*’ > [make] ../cpp/com_trolltech_qt_core/metainfo.cpp:1031: warning: > deprecated conversion from string constant to ‘char*’ > [make] ../cpp/com_trolltech_qt_core/metainfo.cpp:1034: error: > ‘Wrapped’ is not a member of ‘QEvent’ > [...] > [make] make[1]: *** [metainfo.o] Error 1 > [make] make[1]: Leaving directory `/home/fg/src/qt-jambi/qtjambi_core' > [make] make: *** [sub-qtjambi_core-make_default-ordered] Error 2 > ---- >
Found. I have committed the following to the master branch (and the equivalent to the build branch): ---- commit d017dc3efe75cd8a7c87473f4a496a6edd58e16f Author: Francis Galiegue <[email protected]> Date: Sat Oct 17 14:51:36 2009 +0200 Sync with qt commit 5d2f84dc7aa757ea70b0d84b7802feef5515b92e This commit renamed two constants in QEvent. Rename them in the typesystem as well. Signed-off-by: Francis Galiegue <[email protected]> diff --git a/generator/typesystem_core-common.xml b/generator/typesystem_core-common.xml index d53dc71..7f53223 100644 --- a/generator/typesystem_core-common.xml +++ b/generator/typesystem_core-common.xml @@ -965,8 +965,8 @@ </object-type> <object-type name="QIODevice"/> - <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1->type() == QEvent::Signal" /> - <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1->type() == QEvent::Wrapped" /> + <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineSignal" /> + <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1->type() == QEvent::StateMachineWrapped" /> <object-type name="QCryptographicHash"/> <object-type name="QLibraryInfo"/> ---- -- Francis Galiegue, [email protected] "It seems obvious [...] that at least some 'business intelligence' tools invest so much intelligence on the business side that they have nothing left for generating SQL queries" (Stéphane Faroult, in "The Art of SQL", ISBN 0-596-00894-5) _______________________________________________ Qt-jambi-interest mailing list [email protected] http://lists.trolltech.com/mailman/listinfo/qt-jambi-interest
