Changeset 28396 in webkit
- Timestamp:
- Dec 4, 2007 11:10:19 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r28389 r28396 1 2007-12-04 Michael Natterer <mitch@imendio.com> 2 3 Reviewed by Alp Toker. 4 5 * WebCore.pro: fix build of webkit-marshal by building the 6 functions into a separate .cpp file instead of including them in 7 the header. This way we can use the marshallers from more than one 8 file without using bad hacks. 9 10 Add the generated sources directory to DEPENDPATH. 11 1 12 2007-12-04 Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk> 2 13 -
trunk/WebCore/WebCore.pro
r28389 r28396 22 22 23 23 INCLUDEPATH += $$GENERATED_SOURCES_DIR 24 DEPENDPATH += $$GENERATED_SOURCES_DIR 24 25 25 26 !CONFIG(QTDIR_build) { … … 1745 1746 # integrate glib-genmarshal as additional compiler 1746 1747 # 1747 QMAKE_GENMARSHAL_CC 1748 glib-genmarshal. commands = $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header --body >${QMAKE_FILE_OUT}1749 glib-genmarshal. output = $$OUT_PWD/${QMAKE_FILE_BASE}.h1748 QMAKE_GENMARSHAL_CC = glib-genmarshal 1749 glib-genmarshal.output = $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.cpp 1750 glib-genmarshal.commands = echo 'extern \\"C\\" {' > ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --body >> ${QMAKE_FILE_OUT} && echo '}' >> ${QMAKE_FILE_OUT} && $${QMAKE_GENMARSHAL_CC} --prefix=$${GENMARSHALS_PREFIX} ${QMAKE_FILE_IN} --header > $$GENERATED_SOURCES_DIR/${QMAKE_FILE_BASE}.h 1750 1751 glib-genmarshal.input = GENMARSHALS 1751 glib-genmarshal. CONFIG = no_link1752 glib-genmarshal. variable_out = PRE_TARGETDEPS1752 glib-genmarshal.variable_out = GENERATED_SOURCES 1753 glib-genmarshal.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_GENERATED_SOURCES_DIR_SLASH}${QMAKE_FILE_BASE}.h 1753 1754 glib-genmarshal.name = GENMARSHALS 1754 1755 QMAKE_EXTRA_UNIX_COMPILERS += glib-genmarshal -
trunk/WebKit/gtk/ChangeLog
r28388 r28396 1 2007-12-04 Michael Natterer <mitch@imendio.com> 2 3 Reviewed by Alp Toker. 4 5 * WebView/webkitwebframe.cpp: don't redeclare the marshaller 6 prototype but simply include "webkit-marshal.h" now that its build 7 is fixed. 8 1 9 2007-12-04 Luca Bruno <lethalman88@gmail.com> 2 10 -
trunk/WebKit/gtk/WebView/webkitwebframe.cpp
r28384 r28396 29 29 30 30 #include "config.h" 31 31 32 #include "webkitwebframe.h" 32 33 #include "webkitwebview.h" 34 #include "webkit-marshal.h" 33 35 #include "webkitprivate.h" 34 36 … … 49 51 50 52 extern "C" { 51 52 extern void webkit_marshal_VOID__STRING_STRING (GClosure* closure,53 GValue* return_value,54 guint n_param_values,55 const GValue* param_values,56 gpointer invocation_hint,57 gpointer marshal_data);58 53 59 54 enum {
Note: See TracChangeset
for help on using the changeset viewer.