Diff
Modified: trunk/Source/WebKit2/ChangeLog (116943 => 116944)
--- trunk/Source/WebKit2/ChangeLog 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-14 14:01:50 UTC (rev 116944)
@@ -1,3 +1,14 @@
+2012-05-14 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Doesn't build with ENABLE_INSPECTOR=0
+ https://bugs.webkit.org/show_bug.cgi?id=85056
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri:
+ * UIProcess/qt/QtWebContext.cpp:
+ (WebKit::initInspectorServer):
+
2012-05-11 Tor Arne Vestbø <[email protected]>
[Qt] Make sure dialogs have their parent and attached properties set before Component.onCompleted
Modified: trunk/Source/WebKit2/Target.pri (116943 => 116944)
--- trunk/Source/WebKit2/Target.pri 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Source/WebKit2/Target.pri 2012-05-14 14:01:50 UTC (rev 116944)
@@ -208,11 +208,6 @@
UIProcess/GenericCallback.h \
UIProcess/GeolocationPermissionRequestManagerProxy.h \
UIProcess/GeolocationPermissionRequestProxy.h \
- UIProcess/InspectorServer/WebInspectorServer.h \
- UIProcess/InspectorServer/WebSocketServer.h \
- UIProcess/InspectorServer/WebSocketServerClient.h \
- UIProcess/InspectorServer/WebSocketServerConnection.h \
- UIProcess/InspectorServer/qt/WebSocketServerQt.h \
UIProcess/Launcher/ProcessLauncher.h \
UIProcess/Launcher/ThreadLauncher.h \
UIProcess/LayerTreeHostProxy.h \
@@ -554,11 +549,6 @@
UIProcess/FindIndicator.cpp \
UIProcess/GeolocationPermissionRequestManagerProxy.cpp \
UIProcess/GeolocationPermissionRequestProxy.cpp \
- UIProcess/InspectorServer/WebInspectorServer.cpp \
- UIProcess/InspectorServer/WebSocketServer.cpp \
- UIProcess/InspectorServer/WebSocketServerConnection.cpp \
- UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp \
- UIProcess/InspectorServer/qt/WebSocketServerQt.cpp \
UIProcess/Launcher/ProcessLauncher.cpp \
UIProcess/Launcher/ThreadLauncher.cpp \
UIProcess/Launcher/qt/ProcessLauncherQt.cpp \
@@ -782,6 +772,22 @@
Platform/unix/SharedMemoryUnix.cpp
}
+contains(DEFINES, ENABLE_INSPECTOR_SERVER=1) {
+ HEADERS += \
+ UIProcess/InspectorServer/WebInspectorServer.h \
+ UIProcess/InspectorServer/WebSocketServer.h \
+ UIProcess/InspectorServer/WebSocketServerClient.h \
+ UIProcess/InspectorServer/WebSocketServerConnection.h \
+ UIProcess/InspectorServer/qt/WebSocketServerQt.h
+
+ SOURCES += \
+ UIProcess/InspectorServer/WebInspectorServer.cpp \
+ UIProcess/InspectorServer/WebSocketServer.cpp \
+ UIProcess/InspectorServer/WebSocketServerConnection.cpp \
+ UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp \
+ UIProcess/InspectorServer/qt/WebSocketServerQt.cpp
+}
+
contains(DEFINES, ENABLE_TOUCH_EVENTS=1) {
HEADERS += \
Shared/NativeWebTouchEvent.h
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebContext.cpp (116943 => 116944)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebContext.cpp 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebContext.cpp 2012-05-14 14:01:50 UTC (rev 116944)
@@ -47,6 +47,7 @@
static void initInspectorServer()
{
+#if ENABLE(INSPECTOR_SERVER)
QString inspectorEnv = QString::fromUtf8(qgetenv("QTWEBKIT_INSPECTOR_SERVER"));
if (!inspectorEnv.isEmpty()) {
QString bindAddress = QLatin1String("127.0.0.1");
@@ -73,6 +74,7 @@
} else
qWarning("Couldn't start the inspector server on bind address \"%s\" and port \"%d\". In case of invalid input, try something like: \"12345\" or \"192.168.2.14:12345\" (with the address of one of this host's interface).", qPrintable(bindAddress), port);
}
+#endif
}
static void globalInitialization()
Modified: trunk/Tools/ChangeLog (116943 => 116944)
--- trunk/Tools/ChangeLog 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Tools/ChangeLog 2012-05-14 14:01:50 UTC (rev 116944)
@@ -1,3 +1,14 @@
+2012-05-14 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Doesn't build with ENABLE_INSPECTOR=0
+ https://bugs.webkit.org/show_bug.cgi?id=85056
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebKitTestRunner/TestInvocation.cpp: Ifdef otherwise unused static function.
+ * qmake/mkspecs/features/features.prf:
+ * qmake/mkspecs/features/features.pri:
+
2012-05-11 Tor Arne Vestbø <[email protected]>
[Qt] Make sure dialogs have their parent and attached properties set before Component.onCompleted
Modified: trunk/Tools/WebKitTestRunner/TestInvocation.cpp (116943 => 116944)
--- trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Tools/WebKitTestRunner/TestInvocation.cpp 2012-05-14 14:01:50 UTC (rev 116944)
@@ -132,10 +132,12 @@
return strstr(pathOrURL, "loading/");
}
+#if ENABLE(INSPECTOR)
static bool shouldOpenWebInspector(const char* pathOrURL)
{
return strstr(pathOrURL, "inspector/") || strstr(pathOrURL, "inspector\\");
}
+#endif
void TestInvocation::invoke()
{
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (116943 => 116944)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-05-14 14:01:50 UTC (rev 116944)
@@ -201,7 +201,10 @@
contains(DEFINES, ENABLE_SVG=0)|!contains(DEFINES, HAVE_QRAWFONT=1): DEFINES += ENABLE_SVG_FONTS=0
# _javascript_ debugger requires the inspector
-contains(DEFINES, ENABLE_INSPECTOR=0): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=0
+contains(DEFINES, ENABLE_INSPECTOR=0) {
+ DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=0
+ DEFINES += ENABLE_INSPECTOR_SERVER=0
+}
# Remove conflicting defines. The preprocessor would take care of this
# anyways, but doing it here makes for nicer command lines when building.
Modified: trunk/Tools/qmake/mkspecs/features/features.pri (116943 => 116944)
--- trunk/Tools/qmake/mkspecs/features/features.pri 2012-05-14 13:58:56 UTC (rev 116943)
+++ trunk/Tools/qmake/mkspecs/features/features.pri 2012-05-14 14:01:50 UTC (rev 116944)
@@ -53,6 +53,7 @@
ENABLE_INPUT_TYPE_TIME=0 \
ENABLE_INPUT_TYPE_WEEK=0 \
ENABLE_INSPECTOR=1 \
+ ENABLE_INSPECTOR_SERVER=1 \
ENABLE_JAVASCRIPT_DEBUGGER=1 \
ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
ENABLE_LEGACY_NOTIFICATIONS=1 \
