vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/mattn/phantomjs

1.1
Ariya Hidayat 2011-01-28 23:08:49 -08:00
parent 32c5f02f2b ee54806abc
commit dd0ed7facd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/phantomjs.cpp
View File

@ -203,7 +203,7 @@ void Phantom::execute(const QString &fileName)
exit(1); exit(1);
return; return;
} }
m_script = file.readAll(); m_script = QString::fromUtf8(file.readAll());
file.close(); file.close();
m_page.mainFrame()->evaluateJavaScript(m_script); m_page.mainFrame()->evaluateJavaScript(m_script);
@ -341,6 +341,8 @@ int main(int argc, char** argv)
return 1; return 1;
} }
QNetworkProxyFactory::setUseSystemConfiguration(true);
QApplication app(argc, argv); QApplication app(argc, argv);
app.setWindowIcon(QIcon(":/phantomjs-icon.png")); app.setWindowIcon(QIcon(":/phantomjs-icon.png"));