Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

proxy support #3

Closed
wants to merge 2 commits into from
Closed

proxy support #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0398f3
use setUseSystemConfiguration(true).
mattn Jan 28, 2011
ee54806
load script as utf-8 encoding.
mattn Jan 28, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/phantomjs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void Phantom::execute(const QString &fileName)
exit(1);
return;
}
m_script = file.readAll();
m_script = QString::fromUtf8(file.readAll());
file.close();

m_page.mainFrame()->evaluateJavaScript(m_script);
Expand Down Expand Up @@ -341,6 +341,8 @@ int main(int argc, char** argv)
return 1;
}

QNetworkProxyFactory::setUseSystemConfiguration(true);

QApplication app(argc, argv);

app.setWindowIcon(QIcon(":/phantomjs-icon.png"));
Expand Down