logging fixes

Author: mnutt

Source/WTF/wtf/Assertions.h

@@ -182,6 +182,8 @@ typedef struct {
 #define LOG_CHANNEL_WEBKIT_SUBSYSTEM "WPEWebKit"
 #elif PLATFORM(PLAYSTATION)
 #define LOG_CHANNEL_WEBKIT_SUBSYSTEM "SceNKWebKit"
+#elif PLATFORM(QT)
+#define LOG_CHANNEL_WEBKIT_SUBSYSTEM "QtWebKit"
 #else
 #define LOG_CHANNEL_WEBKIT_SUBSYSTEM "com.apple.WebKit"
 #endif

Source/WebCore/platform/qt/LoggingQt.cpp

@@ -19,7 +19,7 @@
 */
 
 #include "config.h"
-#include "Logging.h"
+#include "LogInitialization.h"
 
 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
 
@@ -34,15 +34,9 @@ String logLevelString()
     if (loggingEnv.isEmpty())
         return emptyString();
 
-#if defined(NDEBUG)
-    qWarning("This is a release build. Setting QT_WEBKIT_LOG will have no effect.");
-#else
-
-    // To disable logging notImplemented set the DISABLE_NI_WARNING environment variable to 1.
-    return String(QStringLiteral("NotYetImplemented,").append(QLatin1String(loggingEnv.constData())));
-#endif
+    return String::fromLatin1(loggingEnv.constData());
 }
 
 } // namespace WebCore
 
-#endif // !LOG_DISABLED
+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED

Source/WebKitLegacy/qt/WebCoreSupport/InitWebCoreQt.cpp

@@ -83,9 +83,9 @@ Q_DECL_EXPORT void initializeWebCoreQt()
     if (initialized)
         return;
 
-#if !LOG_DISABLED
+#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
     WebCore::logChannels().initializeLogChannelsIfNecessary();
-#endif // !LOG_DISABLED
+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
     JSC::initialize();
     WTF::initializeMainThread();
     WebCore::SecurityPolicy::setLocalLoadPolicy(WebCore::SecurityPolicy::AllowLocalLoadsForLocalAndSubstituteData);