summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2015-06-26 12:20:14 +0200
committerChristian Stromme <christian.stromme@theqtcompany.com>2015-08-03 10:37:54 +0000
commitd9a18d3caaf80e83abec7a52229be603d5011ceb (patch)
treeed53506f5c748d12a1df33776fb1c68c31d49934
parent88b92638d3cb5cf48a408c1099cb4b950cf91c33 (diff)
Mark all private headers as private.
Since these classes won't be part of the public API any time soon, it's better that we just make them as private. Change-Id: Id3c1aeb0ad537a1630a04f669a2d4feb09d8b2e1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
-rw-r--r--src/imports/webview.cpp4
-rw-r--r--src/webview/qnativeviewcontroller_p.h11
-rw-r--r--src/webview/qquickwebview.cpp4
-rw-r--r--src/webview/qquickwebview_p.h (renamed from src/webview/qquickwebview.h)0
-rw-r--r--src/webview/qquickwebviewloadrequest.cpp2
-rw-r--r--src/webview/qquickwebviewloadrequest_p.h (renamed from src/webview/qquickwebviewloadrequest.h)13
-rw-r--r--src/webview/qwebview_p_p.h11
-rw-r--r--src/webview/qwebviewloadrequest_p.h11
-rw-r--r--src/webview/webview-lib.pri4
9 files changed, 52 insertions, 8 deletions
diff --git a/src/imports/webview.cpp b/src/imports/webview.cpp
index b02f15c..c10e790 100644
--- a/src/imports/webview.cpp
+++ b/src/imports/webview.cpp
@@ -42,8 +42,8 @@
# include <QtWebEngine/private/qquickwebengineloadrequest_p.h>
# include <QtWebEngine/private/qquickwebengineview_p.h>
#else
-# include <QtWebView/qquickwebviewloadrequest.h>
-# include <QtWebView/qquickwebview.h>
+# include <QtWebView/private/qquickwebviewloadrequest_p.h>
+# include <QtWebView/private/qquickwebview_p.h>
#endif // QT_WEBVIEW_WEBENGINE_BACKEND
QT_BEGIN_NAMESPACE
diff --git a/src/webview/qnativeviewcontroller_p.h b/src/webview/qnativeviewcontroller_p.h
index 92c9d96..0abf32d 100644
--- a/src/webview/qnativeviewcontroller_p.h
+++ b/src/webview/qnativeviewcontroller_p.h
@@ -37,6 +37,17 @@
#ifndef QNATIVEVIEWCONTROLLER_P_H
#define QNATIVEVIEWCONTROLLER_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include "qwebview_global.h"
#include <QtCore/qrect.h>
#include <QtGui/qwindow.h>
diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
index 270da36..4d0045d 100644
--- a/src/webview/qquickwebview.cpp
+++ b/src/webview/qquickwebview.cpp
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#include "qquickwebview.h"
-#include "qquickwebviewloadrequest.h"
+#include "qquickwebview_p.h"
+#include "qquickwebviewloadrequest_p.h"
#include <QtWebView/private/qwebviewloadrequest_p.h>
#include <QtQml/qqmlengine.h>
#include <QtCore/qmutex.h>
diff --git a/src/webview/qquickwebview.h b/src/webview/qquickwebview_p.h
index 236a06e..236a06e 100644
--- a/src/webview/qquickwebview.h
+++ b/src/webview/qquickwebview_p.h
diff --git a/src/webview/qquickwebviewloadrequest.cpp b/src/webview/qquickwebviewloadrequest.cpp
index 3e614a3..b504560 100644
--- a/src/webview/qquickwebviewloadrequest.cpp
+++ b/src/webview/qquickwebviewloadrequest.cpp
@@ -34,7 +34,7 @@
**
****************************************************************************/
-#include "qquickwebviewloadrequest.h"
+#include "qquickwebviewloadrequest_p.h"
#include <QtWebView/private/qwebviewloadrequest_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/webview/qquickwebviewloadrequest.h b/src/webview/qquickwebviewloadrequest_p.h
index 1d8731e..4a16567 100644
--- a/src/webview/qquickwebviewloadrequest.h
+++ b/src/webview/qquickwebviewloadrequest_p.h
@@ -37,7 +37,18 @@
#ifndef QQUICKWEBVIEWREQUEST_H
#define QQUICKWEBVIEWREQUEST_H
-#include <QtWebView/qquickwebview.h>
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtWebView/private/qquickwebview_p.h>
#include <QtWebView/qwebview_global.h>
#include <QObject>
diff --git a/src/webview/qwebview_p_p.h b/src/webview/qwebview_p_p.h
index a369729..45a352b 100644
--- a/src/webview/qwebview_p_p.h
+++ b/src/webview/qwebview_p_p.h
@@ -37,6 +37,17 @@
#ifndef QWEBVIEW_P_P_H
#define QWEBVIEW_P_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include "qwebviewinterface_p.h"
#include "qnativeviewcontroller_p.h"
diff --git a/src/webview/qwebviewloadrequest_p.h b/src/webview/qwebviewloadrequest_p.h
index 2e1a8a0..bbe1fb1 100644
--- a/src/webview/qwebviewloadrequest_p.h
+++ b/src/webview/qwebviewloadrequest_p.h
@@ -38,6 +38,17 @@
#ifndef QWEBVIEWLOADREQUESTPRIVATE_H
#define QWEBVIEWLOADREQUESTPRIVATE_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtWebView/private/qwebview_p.h>
#include <QtCore/qstring.h>
#include <QtCore/qurl.h>
diff --git a/src/webview/webview-lib.pri b/src/webview/webview-lib.pri
index 9506a79..320e947 100644
--- a/src/webview/webview-lib.pri
+++ b/src/webview/webview-lib.pri
@@ -11,12 +11,12 @@ PUBLIC_HEADERS += \
COMMON_HEADERS += \
qwebview_p.h \
qwebviewinterface_p.h \
- qquickwebview.h \
+ qquickwebview_p.h \
qnativeviewcontroller_p.h \
qwebview_p_p.h \
qquickviewcontroller_p.h \
qwebviewloadrequest_p.h \
- qquickwebviewloadrequest.h
+ qquickwebviewloadrequest_p.h
COMMON_SOURCES += \
qwebview.cpp \