Title: [100607] trunk/Source/WebKit2
- Revision
- 100607
- Author
- ves...@webkit.org
- Date
- 2011-11-17 05:02:36 -0800 (Thu, 17 Nov 2011)
Log Message
[Qt] Remove forwarding header for WebKit2 C API
The Qt port of WebKit does not provide a C-API for the View classes.
Reviewed by Simon Hausmann.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (100606 => 100607)
--- trunk/Source/WebKit2/ChangeLog 2011-11-17 13:01:15 UTC (rev 100606)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-17 13:02:36 UTC (rev 100607)
@@ -1,5 +1,16 @@
2011-11-17 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Remove forwarding header for WebKit2 C API
+
+ The Qt port of WebKit does not provide a C-API for the View classes.
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/C/WebKit2.h:
+ * UIProcess/API/qt/WKView.h: Removed.
+
+2011-11-17 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Resolve import and web-process paths automatically for QML tests
Reviewed by Kenneth Rohde Christiansen.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h (100606 => 100607)
--- trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2011-11-17 13:01:15 UTC (rev 100606)
+++ trunk/Source/WebKit2/UIProcess/API/C/WebKit2.h 2011-11-17 13:02:36 UTC (rev 100607)
@@ -61,7 +61,7 @@
#if defined(__OBJC__) && __OBJC__
#import <WebKit2/WKView.h>
-#elif !(defined(__APPLE__) && __APPLE__)
+#elif !((defined(__APPLE__) && __APPLE__) || defined(BUILDING_QT__))
#include <WebKit2/WKView.h>
#endif
Deleted: trunk/Source/WebKit2/UIProcess/API/qt/WKView.h (100606 => 100607)
--- trunk/Source/WebKit2/UIProcess/API/qt/WKView.h 2011-11-17 13:01:15 UTC (rev 100606)
+++ trunk/Source/WebKit2/UIProcess/API/qt/WKView.h 2011-11-17 13:02:36 UTC (rev 100607)
@@ -1,28 +0,0 @@
-/*
- Copyright (C) 2010 Nokia Corporation 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
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef WKView_h
-#define WKView_h
-
-#include <WebKit2/qquickwebpage.h>
-#include <WebKit2/qquickwebview.h>
-#include <WebKit2/qwebdownloaditem.h>
-#include <WebKit2/qwebpreferences.h>
-
-#endif /* WKView_h */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
