Roll out r21916 as it did nothing to fix the build.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 642e51d061c587592cef5e8176742fd0d9d91308..f8f70345d93cd2351fb18b14a5cb5148d7d44b94 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -175,14 +175,6 @@
         (-[WebCoreAXObject accessibilityAttributeValue:]):
         Convert the url string to an NSURL before returning as the AXURLAttribute
 
-2007-05-31  George Staikos  <staikos@kde.org>
-
-        Reviewed by Nikolas.
-
-        Compile again - Qt build.
-
-        * WebCore.pro: header guard added to CSSGrammar.h
-
 2007-05-30  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Oliver.

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 1319b935d16998edf45cbc330a03b53ff3714fda..0eea0db8e32a8950cb841550c6bd24deed017f90 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1288,10 +1288,8 @@ tokenizer.CONFIG += target_predeps no_link
 QMAKE_EXTRA_COMPILERS += tokenizer
 
 # GENERATOR 4: CSS grammar
-CSS_GRAMMAR_GUARD_A = "\\\43ifndef CSSGRAMMAR_H\\\n\\\43define CSSGRAMMAR_H"
-CSS_GRAMMAR_GUARD_B = "\\\43endif"
 cssbison.output = tmp/${QMAKE_FILE_BASE}.cpp
-cssbison.commands = bison -d -p cssyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && mv ${QMAKE_FILE_BASE}.tab.c tmp/${QMAKE_FILE_BASE}.cpp && touch tmp/${QMAKE_FILE_BASE}.h && echo -e $$CSS_GRAMMAR_GUARD_A > tmp/${QMAKE_FILE_BASE}.h && cat ${QMAKE_FILE_BASE}.tab.h >> tmp/${QMAKE_FILE_BASE}.h && echo -e $$CSS_GRAMMAR_GUARD_B >> tmp/${QMAKE_FILE_BASE}.h && rm ${QMAKE_FILE_BASE}.tab.h
+cssbison.commands = bison -d -p cssyy ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_BASE}.tab.c && mv ${QMAKE_FILE_BASE}.tab.c tmp/${QMAKE_FILE_BASE}.cpp && mv ${QMAKE_FILE_BASE}.tab.h tmp/${QMAKE_FILE_BASE}.h
 cssbison.depend = ${QMAKE_FILE_NAME}
 cssbison.input = CSSBISON
 cssbison.CONFIG = target_predeps