- Revision
- 121959
- Author
- [email protected]
- Date
- 2012-07-06 06:12:01 -0700 (Fri, 06 Jul 2012)
Log Message
[Qt] Adjust to changed generation of master include file
The responsiblity for creating the master include was moved out of syncqt.
@ignore_for_master_contents still stays, as syncqt (ab-)uses this for
determining whether a header is private.
https://bugs.webkit.org/show_bug.cgi?id=90461
Patch by Oswald Buddenhagen <[email protected]> on 2012-07-06
Reviewed by Tor Arne Vestbø.
.:
* Source/sync.profile:
Source/WebKit/qt:
* Api/qwebscriptworld.h:
* tests/util.h:
Source/WebKit2:
* UIProcess/API/qt/tests/bytearraytestdata.h:
* UIProcess/API/qt/tests/testwindow.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (121958 => 121959)
--- trunk/ChangeLog 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/ChangeLog 2012-07-06 13:12:01 UTC (rev 121959)
@@ -1,3 +1,17 @@
+2012-07-06 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Adjust to changed generation of master include file
+
+ The responsiblity for creating the master include was moved out of syncqt.
+ @ignore_for_master_contents still stays, as syncqt (ab-)uses this for
+ determining whether a header is private.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/sync.profile:
+
2012-07-05 Rob Buis <[email protected]>
[CMake] Fix some CMake warnings
Modified: trunk/Source/WebKit/qt/Api/qwebscriptworld.h (121958 => 121959)
--- trunk/Source/WebKit/qt/Api/qwebscriptworld.h 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit/qt/Api/qwebscriptworld.h 2012-07-06 13:12:01 UTC (rev 121959)
@@ -20,6 +20,10 @@
#ifndef QWebScriptWorld_h_
#define QWebScriptWorld_h_
+#if 0
+#pragma qt_no_master_include
+#endif
+
#include <QtCore/qurl.h>
#include <QtCore/qshareddata.h>
Modified: trunk/Source/WebKit/qt/ChangeLog (121958 => 121959)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-06 13:12:01 UTC (rev 121959)
@@ -1,3 +1,18 @@
+2012-07-06 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Adjust to changed generation of master include file
+
+ The responsiblity for creating the master include was moved out of syncqt.
+ @ignore_for_master_contents still stays, as syncqt (ab-)uses this for
+ determining whether a header is private.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Api/qwebscriptworld.h:
+ * tests/util.h:
+
2012-07-04 Tor Arne Vestbø <[email protected]>
[Qt] Get rid of un-needed QT += declarative for Qt 5
Modified: trunk/Source/WebKit/qt/tests/util.h (121958 => 121959)
--- trunk/Source/WebKit/qt/tests/util.h 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit/qt/tests/util.h 2012-07-06 13:12:01 UTC (rev 121959)
@@ -18,6 +18,10 @@
*/
// Functions and macros that really need to be in QTestLib
+#if 0
+#pragma qt_no_master_include
+#endif
+
#include <QEventLoop>
#include <QSignalSpy>
#include <QTimer>
Modified: trunk/Source/WebKit2/ChangeLog (121958 => 121959)
--- trunk/Source/WebKit2/ChangeLog 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-06 13:12:01 UTC (rev 121959)
@@ -1,3 +1,18 @@
+2012-07-06 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Adjust to changed generation of master include file
+
+ The responsiblity for creating the master include was moved out of syncqt.
+ @ignore_for_master_contents still stays, as syncqt (ab-)uses this for
+ determining whether a header is private.
+
+ https://bugs.webkit.org/show_bug.cgi?id=90461
+
+ Reviewed by Tor Arne Vestbø.
+
+ * UIProcess/API/qt/tests/bytearraytestdata.h:
+ * UIProcess/API/qt/tests/testwindow.h:
+
2012-07-05 Christophe Dumez <[email protected]>
[WK2][EFL] Ewk_View needs to report load status changes
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h (121958 => 121959)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/bytearraytestdata.h 2012-07-06 13:12:01 UTC (rev 121959)
@@ -21,6 +21,10 @@
#ifndef bytearraytestdata_h
#define bytearraytestdata_h
+#if 0
+#pragma qt_no_master_include
+#endif
+
#include "qwebkitglobal.h"
#include <QByteArray>
#include <QObject>
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h (121958 => 121959)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h 2012-07-06 13:12:01 UTC (rev 121959)
@@ -20,6 +20,10 @@
#ifndef testwindow_h
#define testwindow_h
+#if 0
+#pragma qt_no_master_include
+#endif
+
#include <QResizeEvent>
#include <QScopedPointer>
#include <QtQuick/qquickitem.h>
Modified: trunk/Source/sync.profile (121958 => 121959)
--- trunk/Source/sync.profile 2012-07-06 13:10:45 UTC (rev 121958)
+++ trunk/Source/sync.profile 2012-07-06 13:12:01 UTC (rev 121959)
@@ -6,12 +6,6 @@
);
%classnames = (
);
-%mastercontent = (
- "core" => "#include <QtCore/QtCore>\n",
- "gui" => "#include <QtGui/QtGui>\n",
- "network" => "#include <QtNetwork/QtNetwork>\n",
- "script" => "#include <QtScript/QtScript>\n",
-);
%modulepris = (
"QtWebKit" => "$basedir/../Tools/qmake/qt_webkit.pri",
);
