Remove support for old compat qdoc commands.

The \i command is not used in any Qt Location documentation and the
presence of the above macro definitions generates spurious qdoc
warnings.

Fix the last few remaining uses of these compat commands and remove the
compat.qdocconf file.

Change-Id: Icb1c9aa131cf93e19f32db5359c26c1338b26dfd
Reviewed-by: Alex <alex.blasche@nokia.com>

7 files changed, 8 insertions, 40 deletions

diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf
deleted file mode 100644
index 53a26136..00000000
--- a/doc/config/compat.qdocconf
+++ /dev/null
@@ -1,31 +0,0 @@
-alias.i                         = e
-alias.include                   = input
-
-macro.0                         = "\\\\0"
-macro.b                         = "\\\\b"
-macro.n                         = "\\\\n"
-macro.r                         = "\\\\r"
-macro.i                         = "\\li"
-macro.i11                       = "\\li{1,1}"
-macro.i12                       = "\\li{1,2}"
-macro.i13                       = "\\li{1,3}"
-macro.i14                       = "\\li{1,4}"
-macro.i15                       = "\\li{1,5}"
-macro.i16                       = "\\li{1,6}"
-macro.i17                       = "\\li{1,7}"
-macro.i18                       = "\\li{1,8}"
-macro.i19                       = "\\li{1,9}"
-macro.i21                       = "\\li{2,1}"
-macro.i31                       = "\\li{3,1}"
-macro.i41                       = "\\li{4,1}"
-macro.i51                       = "\\li{5,1}"
-macro.i61                       = "\\li{6,1}"
-macro.i71                       = "\\li{7,1}"
-macro.i81                       = "\\li{8,1}"
-macro.i91                       = "\\li{9,1}"
-macro.img                       = "\\image"
-macro.endquote                  = "\\endquotation"
-macro.relatesto                 = "\\relates"
-
-spurious                        = "Missing comma in .*" \
-                                  "Missing pattern .*"
diff --git a/doc/config/qtlocation.qdocconf b/doc/config/qtlocation.qdocconf
index 6a208b48..b07f3d85 100644
--- a/doc/config/qtlocation.qdocconf
+++ b/doc/config/qtlocation.qdocconf
@@ -1,4 +1,3 @@
-include(compat.qdocconf)
 include(macros.qdocconf)
 include(qt-cpp-ignore.qdocconf)
 include(qt-defines.qdocconf)
diff --git a/doc/src/places.qdoc b/doc/src/places.qdoc
index 0ee67b5d..d4bb5929 100644
--- a/doc/src/places.qdoc
+++ b/doc/src/places.qdoc
@@ -115,7 +115,7 @@
     categories, allowing users to save and remove them.
 
     \section1 Place Definition
-    \input place-definition.qdocinc
+    \include place-definition.qdocinc
 
     \section1 Common Operations
 
@@ -209,7 +209,7 @@
     from a web service will typically not emit these signals while managers accessing places locally stored generally will.
 
     \section3 Caveats
-    \input place-caveats.qdocinc
+    \include place-caveats.qdocinc
 
     \section3 Saving Between Managers
     When saving places between managers, there are a few things to be aware of.
@@ -302,7 +302,7 @@
     as part of the saving process an alternative identifier attribute, x_id_nokia, is set for the place saved into the destination manager
     (when QPlaceManager::compatiblePlace() is called)
 
-    \input place-crossref.qdocinc
+    \include place-crossref.qdocinc
 
     In order to perform the matching, we create a QPlaceMatchRequest and assign it the search results from the origin manager.
     The QPlaceMatchRequest will be used on the destination manager to return corresponding places.  We also specify
diff --git a/doc/src/plugins/nokia_terms.qdoc b/doc/src/plugins/nokia_terms.qdoc
index 5166e1ed..1db6f51f 100644
--- a/doc/src/plugins/nokia_terms.qdoc
+++ b/doc/src/plugins/nokia_terms.qdoc
@@ -36,6 +36,6 @@ src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt in the Qt Location
 package.  The terms and conditions are reproduced below for convenience.
 
 \legalese
-\input plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt
+\include plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt
 \endlegalese
 */
diff --git a/doc/src/plugins/places-backend.qdoc b/doc/src/plugins/places-backend.qdoc
index 0835ee0c..1155c9f2 100644
--- a/doc/src/plugins/places-backend.qdoc
+++ b/doc/src/plugins/places-backend.qdoc
@@ -117,7 +117,7 @@ rather than the original name.
 In order to accomplish cross-referencing, there needs to be a link between the original place and the favorited place
 and this is typically handled via an alternative identifier attribute.  The favorited place contains an alternative identifier attribute which has the identifier of the original place.
 
-\input place-crossref.qdocinc
+\include place-crossref.qdocinc
 
 There are 3 prerequisites for implementing cross-referencing by alternative identifier.  The first is that the origin manager must provide the x_provider attribute
 with the value being the name of the manager's QGeoServiceProvider.  The attribute label should be kept empty, indicating the attribute should not
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index d228dbd6..af8758df 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -126,7 +126,7 @@ QT_USE_NAMESPACE
     saved place.
 
     \section3 Caveats
-    \input place-caveats.qdocinc
+    \include place-caveats.qdocinc
 
     \section3 Saving Between Plugins
     When saving places between plugins, there are a few things to be aware of.
diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp
index f6743a80..464e6f82 100644
--- a/src/location/places/qplace.cpp
+++ b/src/location/places/qplace.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QPlace class represents a set of data about a place.
 
-    \input place-definition.qdocinc
+    \include place-definition.qdocinc
 
     \section2 Contact Information
     The contact information of a place is based around a common set of
@@ -114,7 +114,7 @@ QT_BEGIN_NAMESPACE
     the category to be created).
 
     \section2 Saving Caveats
-    \input place-caveats.qdocinc
+    \include place-caveats.qdocinc
 */
 
 /*!