Merge pull request #291 from jonleighton/static_inspector

Fix remote inspector when building statically.
ariya · Jul 7, 2012 · 940e008 · 940e008
2 parents 516c70b + 95186c6
commit 940e008
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -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");

diff --git a/src/phantomjs.pro b/src/phantomjs.pro
@@ -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
-}