Changeset 561 for trunk/include/QtWebKit


Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
3 edited
10 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/include/QtWebKit/QtWebKit

    r2 r561  
    22#define QT_QTWEBKIT_MODULE_H
    33#include <QtNetwork/QtNetwork>
     4#include <QtXmlPatterns/QtXmlPatterns>
     5#include "qgraphicswebview.h"
    46#include "qwebdatabase.h"
     7#include "qwebelement.h"
    58#include "qwebframe.h"
    69#include "qwebhistory.h"
    710#include "qwebhistoryinterface.h"
     11#include "qwebinspector.h"
    812#include "qwebkitglobal.h"
     13#include "qwebkitversion.h"
    914#include "qwebpage.h"
    1015#include "qwebpluginfactory.h"

  • trunk/include/QtWebKit/headers.pri

    r2 r561  
    1 SYNCQT.HEADER_FILES = ../WebCore/../WebKit/qt/Api/qwebdatabase.h ../WebCore/../WebKit/qt/Api/qwebframe.h ../WebCore/../WebKit/qt/Api/qwebhistory.h ../WebCore/../WebKit/qt/Api/qwebhistoryinterface.h ../WebCore/../WebKit/qt/Api/qwebkitglobal.h ../WebCore/../WebKit/qt/Api/qwebpage.h ../WebCore/../WebKit/qt/Api/qwebpluginfactory.h ../WebCore/../WebKit/qt/Api/qwebsecurityorigin.h ../WebCore/../WebKit/qt/Api/qwebsettings.h ../WebCore/../WebKit/qt/Api/qwebview.h ../../../../include/QtWebKit/QtWebKit
    2 SYNCQT.HEADER_CLASSES = ../../../../include/QtWebKit/QWebDatabase ../../../../include/QtWebKit/QWebHitTestResult ../../../../include/QtWebKit/QWebFrame ../../../../include/QtWebKit/QWebHistoryItem ../../../../include/QtWebKit/QWebHistory ../../../../include/QtWebKit/QWebHistoryInterface ../../../../include/QtWebKit/QWebPage ../../../../include/QtWebKit/QWebPluginFactory ../../../../include/QtWebKit/QWebSecurityOrigin ../../../../include/QtWebKit/QWebSettings ../../../../include/QtWebKit/QWebView
     1SYNCQT.HEADER_FILES = ../WebCore/../WebKit/qt/Api/qgraphicswebview.h ../WebCore/../WebKit/qt/Api/qwebdatabase.h ../WebCore/../WebKit/qt/Api/qwebelement.h ../WebCore/../WebKit/qt/Api/qwebframe.h ../WebCore/../WebKit/qt/Api/qwebhistory.h ../WebCore/../WebKit/qt/Api/qwebhistoryinterface.h ../WebCore/../WebKit/qt/Api/qwebinspector.h ../WebCore/../WebKit/qt/Api/qwebkitglobal.h ../WebCore/../WebKit/qt/Api/qwebkitversion.h ../WebCore/../WebKit/qt/Api/qwebpage.h ../WebCore/../WebKit/qt/Api/qwebpluginfactory.h ../WebCore/../WebKit/qt/Api/qwebsecurityorigin.h ../WebCore/../WebKit/qt/Api/qwebsettings.h ../WebCore/../WebKit/qt/Api/qwebview.h ../../../../include/QtWebKit/QtWebKit
     2SYNCQT.HEADER_CLASSES = ../../../../include/QtWebKit/QGraphicsWebView ../../../../include/QtWebKit/QWebDatabase ../../../../include/QtWebKit/QWebElement ../../../../include/QtWebKit/QWebElementCollection ../../../../include/QtWebKit/QWebHitTestResult ../../../../include/QtWebKit/QWebFrame ../../../../include/QtWebKit/QWebHistoryItem ../../../../include/QtWebKit/QWebHistory ../../../../include/QtWebKit/QWebHistoryInterface ../../../../include/QtWebKit/QWebInspector ../../../../include/QtWebKit/QWebPage ../../../../include/QtWebKit/QWebPluginFactory ../../../../include/QtWebKit/QWebSecurityOrigin ../../../../include/QtWebKit/QWebSettings ../../../../include/QtWebKit/QWebView
     3SYNCQT.PRIVATE_HEADER_FILES = ../WebCore/../WebKit/qt/Api/qwebdatabase_p.h ../WebCore/../WebKit/qt/Api/qwebframe_p.h ../WebCore/../WebKit/qt/Api/qwebhistory_p.h ../WebCore/../WebKit/qt/Api/qwebinspector_p.h ../WebCore/../WebKit/qt/Api/qwebpage_p.h ../WebCore/../WebKit/qt/Api/qwebplugindatabase_p.h ../WebCore/../WebKit/qt/Api/qwebsecurityorigin_p.h
Note: See TracChangeset for help on using the changeset viewer.