mirror of https://github.com/vitalif/phantomjs
Merge pull request #291 from jonleighton/static_inspector
Fix remote inspector when building statically.1.7
commit
940e0089ba
|
@ -61,11 +61,6 @@ int main(int argc, char** argv, const char** envp)
|
|||
Utils::printDebugMessages = phantom.printDebugMessages();
|
||||
qInstallMsgHandler(Utils::messageHandler);
|
||||
|
||||
#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");
|
||||
|
|
|
@ -5,7 +5,9 @@ CONFIG += console
|
|||
|
||||
DESTDIR = ../bin
|
||||
|
||||
RESOURCES = phantomjs.qrc
|
||||
RESOURCES = phantomjs.qrc \
|
||||
qt/src/3rdparty/webkit/Source/WebCore/inspector/front-end/WebKit.qrc \
|
||||
qt/src/3rdparty/webkit/Source/WebCore/generated/InspectorBackendStub.qrc
|
||||
|
||||
HEADERS += csconverter.h \
|
||||
phantom.h \
|
||||
|
@ -103,6 +105,3 @@ mac {
|
|||
# Uncomment to build a Mac OS X Universal Binary (i.e. x86 + ppc)
|
||||
# CONFIG += x86 ppc
|
||||
}
|
||||
CONFIG(static) {
|
||||
DEFINES += STATIC_BUILD
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue