Title: [152715] trunk
Revision
152715
Author
[email protected]
Date
2013-07-16 05:22:20 -0700 (Tue, 16 Jul 2013)

Log Message

[Qt] Replace Nokia references.
https://bugs.webkit.org/show_bug.cgi?id=118728

Reviewed by Simon Hausmann.

Source/WebKit/qt:

* Api/qwebkitplatformplugin.h:
* examples/platformplugin/qwebkitplatformplugin.h:

Tools:

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::MiniBrowserApplication):
* QtTestBrowser/qttestbrowser.cpp:
(LauncherApplication::LauncherApplication):

Modified Paths

Diff

Modified: trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h (152714 => 152715)


--- trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/Api/qwebkitplatformplugin.h	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -180,7 +181,7 @@
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9");
 QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H

Modified: trunk/Source/WebKit/qt/ChangeLog (152714 => 152715)


--- trunk/Source/WebKit/qt/ChangeLog	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/ChangeLog	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,3 +1,13 @@
+2013-07-16  Michael BrĂ¼ning  <[email protected]>
+
+        [Qt] Replace Nokia references.
+        https://bugs.webkit.org/show_bug.cgi?id=118728
+
+        Reviewed by Simon Hausmann.
+
+        * Api/qwebkitplatformplugin.h:
+        * examples/platformplugin/qwebkitplatformplugin.h:
+
 2013-07-14  Kangil Han  <[email protected]>
 
         Introduce toHTMLVideoElement

Modified: trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h (152714 => 152715)


--- trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Source/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -180,7 +181,7 @@
 };
 
 QT_BEGIN_NAMESPACE
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.9");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "org.qt-project.Qt.WebKit.PlatformPlugin/1.9");
 QT_END_NAMESPACE
 
 #endif // QWEBKITPLATFORMPLUGIN_H

Modified: trunk/Tools/ChangeLog (152714 => 152715)


--- trunk/Tools/ChangeLog	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/ChangeLog	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,3 +1,15 @@
+2013-07-16  Michael BrĂ¼ning  <[email protected]>
+
+        [Qt] Replace Nokia references.
+        https://bugs.webkit.org/show_bug.cgi?id=118728
+
+        Reviewed by Simon Hausmann.
+
+        * MiniBrowser/qt/MiniBrowserApplication.cpp:
+        (MiniBrowserApplication::MiniBrowserApplication):
+        * QtTestBrowser/qttestbrowser.cpp:
+        (LauncherApplication::LauncherApplication):
+
 2013-07-15  Tim Horton  <[email protected]>
 
         Update blocked/missing plug-in UI

Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (152714 => 152715)


--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2010 University of Szeged
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  *
  * All rights reserved.
  *
@@ -83,7 +84,7 @@
     , m_windowOptions(this)
     , m_holdingControl(false)
 {
-    setOrganizationName("Nokia");
+    setOrganizationName("QtProject");
     setApplicationName("QtMiniBrowser");
     setApplicationVersion("0.1");
 

Modified: trunk/Tools/QtTestBrowser/qttestbrowser.cpp (152714 => 152715)


--- trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2013-07-16 11:57:08 UTC (rev 152714)
+++ trunk/Tools/QtTestBrowser/qttestbrowser.cpp	2013-07-16 12:22:20 UTC (rev 152715)
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Girish Ramakrishnan <[email protected]>
  * Copyright (C) 2006 George Staikos <[email protected]>
@@ -94,7 +95,7 @@
     , m_robotExtraTimeSeconds(0)
 {
     // To allow QWebInspector's configuration persistence
-    setOrganizationName("Nokia");
+    setOrganizationName("QtProject");
     setApplicationName("QtTestBrowser");
     setApplicationVersion("0.1");
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to