Merge pull request #254 from jonleighton/static_inspector

Fix remote inspector + static build.
1.6
Ariya Hidayat 2012-06-03 06:10:13 -07:00
commit 7448af2f69
2 changed files with 8 additions and 0 deletions

View File

@ -45,6 +45,11 @@ int main(int argc, char** argv, const char** envp)
QApplication app(argc, argv);
#ifdef STATIC_BUILD
Q_INIT_RESOURCE(WebKit);
Q_INIT_RESOURCE(InspectorBackendStub);
#endif
app.setWindowIcon(QIcon(":/phantomjs-icon.png"));
app.setApplicationName("PhantomJS");
app.setOrganizationName("Ofi Labs");

View File

@ -68,3 +68,6 @@ mac {
# Uncomment to build a Mac OS X Universal Binary (i.e. x86 + ppc)
# CONFIG += x86 ppc
}
CONFIG(static) {
DEFINES += STATIC_BUILD
}