[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_khtml=3A_Fix_testregression_build_with_f?=
From:       Maks Orlovich <maksim () kde ! org>
Date:       2011-05-17 12:46:31
Message-ID: 20110517124631.3A6D4A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 2fe7332d605d4af5a16ecbb73f3e02accda61a40 by Maks Orlovich.
Committed on 30/04/2011 at 16:32.
Pushed by orlovich into branch 'master'.

Fix testregression build with fastappend on.

M  +1    -1    khtml/test_regression.cpp     
M  +1    -1    khtml/test_regression_gui_window.cpp     

http://commits.kde.org/kdelibs/2fe7332d605d4af5a16ecbb73f3e02accda61a40

diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 70e332a..d4d43da 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -1530,7 +1530,7 @@ void RegressionTest::testStaticFile(const QString & filename)
             return;
         }
 
-        KJS::Completion comp2 = m_part->jScriptInterpreter()->evaluate(filename, 0, \
"setUpPage(); " + functionname + "();" ); +        KJS::Completion comp2 = \
m_part->jScriptInterpreter()->evaluate(filename, 0, QString("setUpPage(); " + \
                functionname + "();") );
         bool success = ( comp2.complType() == ReturnValue || comp2.complType() == \
Normal );  QString description = "DOMTS";
         if ( comp2.complType() == Throw ) {
diff --git a/khtml/test_regression_gui_window.cpp \
b/khtml/test_regression_gui_window.cpp index 3c19f28..4a6022c 100644
--- a/khtml/test_regression_gui_window.cpp
+++ b/khtml/test_regression_gui_window.cpp
@@ -1151,7 +1151,7 @@ void TestRegressionWindow::updateLogOutput(const QString &data)
 		if(!fileExists)
 			file.write(QString::fromLatin1("<html>\n<body>\n").toAscii());
 
-		file.write((data + "\n").toAscii());	//krazy:exclude=duoblequote_chars DOM demands \
chars +		file.write(QString(data + \
"\n").toAscii());	//krazy:exclude=duoblequote_chars DOM demands chars  file.close();
 
 		// Reset save log url, if we reached the end...


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic