Title: [136436] trunk/Source/WebKit/qt
- Revision
- 136436
- Author
- pierre.ro...@gmail.com
- Date
- 2012-12-03 13:48:41 -0800 (Mon, 03 Dec 2012)
Log Message
[Qt] Unreviewed speculative Windows buildfix.
Somehow it seems messing around with the export macros made some old issues resurface.
* Api/qwebsettings.cpp:
(qt_networkAccessAllowed):
* Api/qwebsettings.h:
* Api/qwebkitglobal.h: fix an obvious blunder from r136394.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebkitglobal.h (136435 => 136436)
--- trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-12-03 21:42:39 UTC (rev 136435)
+++ trunk/Source/WebKit/qt/Api/qwebkitglobal.h 2012-12-03 21:48:41 UTC (rev 136436)
@@ -38,8 +38,8 @@
# define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT
# endif
#else
+# define QWEBKITWIDGETS_EXPORT
# define QWEBKIT_EXPORT
-# define QWEBKIT_EXPORT
#endif
QWEBKIT_EXPORT QString qWebKitVersion();
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (136435 => 136436)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-12-03 21:42:39 UTC (rev 136435)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-12-03 21:48:41 UTC (rev 136436)
@@ -55,7 +55,7 @@
-void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed)
+QWEBKIT_EXPORT void qt_networkAccessAllowed(bool isAllowed)
{
#ifndef QT_NO_BEARERMANAGEMENT
WebCore::networkStateNotifier().setNetworkAccessAllowed(isAllowed);
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.h (136435 => 136436)
--- trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-12-03 21:42:39 UTC (rev 136435)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.h 2012-12-03 21:48:41 UTC (rev 136436)
@@ -38,6 +38,8 @@
class QUrl;
QT_END_NAMESPACE
+QWEBKIT_EXPORT void qt_networkAccessAllowed(bool isAllowed);
+
class QWEBKIT_EXPORT QWebSettings {
public:
enum FontFamily {
Modified: trunk/Source/WebKit/qt/ChangeLog (136435 => 136436)
--- trunk/Source/WebKit/qt/ChangeLog 2012-12-03 21:42:39 UTC (rev 136435)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-12-03 21:48:41 UTC (rev 136436)
@@ -1,3 +1,14 @@
+2012-12-03 Pierre Rossi <pierre.ro...@digia.com>
+
+ [Qt] Unreviewed speculative Windows buildfix.
+
+ Somehow it seems messing around with the export macros made some old issues resurface.
+
+ * Api/qwebsettings.cpp:
+ (qt_networkAccessAllowed):
+ * Api/qwebsettings.h:
+ * Api/qwebkitglobal.h: fix an obvious blunder from r136394.
+
2012-12-03 Jocelyn Turcotte <jocelyn.turco...@digia.com>
Document::initSecurityContext() fails to call securityOrigin().grantLoadLocalResources()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
