Rename "support" to "extras" everywhere, to match the new module name

Change-Id: Ic089aa287b38b756bb9f0bc252c4120859afcefa
Reviewed-by: Richard J. Moore <rich@kde.org>

11 files changed, 31 insertions, 31 deletions

diff --git a/qtx11support.pro b/qtx11extras.pro
index 58c33f2..58c33f2 100644
--- a/qtx11support.pro
+++ b/qtx11extras.pro
diff --git a/src/src.pro b/src/src.pro
index 97de7b0..184bfd5 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  x11support
+SUBDIRS +=  x11extras
diff --git a/src/x11support/doc/qtx11support.qdocconf b/src/x11extras/doc/qtx11extras.qdocconf
index ba5db5c..da6fd58 100644
--- a/src/x11support/doc/qtx11support.qdocconf
+++ b/src/x11extras/doc/qtx11extras.qdocconf
@@ -1,7 +1,7 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 # Name of the project which must match the outputdir. Determines the .index file
-project = qtx11support
+project = qtx11extras
 
 # Directories in which to search for files to document and images.
 # By default set to the root directory of the project for sources
@@ -25,22 +25,22 @@ depends += qtcore qtwidgets
 # Defines the name of the project. You cannot use operators (+, =, -) in
 # the name. Properties for this project are set using a qhp.<projectname>.property
 # format.
-qhp.projects = qtx11support
+qhp.projects = qtx11extras
 
 # Sets the name of the output qhp file.
-qhp.qtx11support.file = qtx11support.qhp
+qhp.qtx11extras.file = qtx11extras.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtx11support.namespace = org.qt-project.qtx11support.500
+qhp.qtx11extras.namespace = org.qt-project.qtx11extras.500
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
-qhp.qtx11support.indexTitle = Qt X11 Support Documentation
+qhp.qtx11extras.indexTitle = Qt X11 Extra Classes Documentation
 
 # Only update the name of the project for the next variables.
-qhp.qtx11support.virtualFolder  = qtx11support
-qhp.qtx11support.subprojects = classes
-qhp.qtx11support.subprojects.classes.title = Qt X11 Support C++ Classes
-qhp.qtx11support.subprojects.classes.selectors = class fake:headerfile
-qhp.qtx11support.subprojects.classes.sortPages = true
+qhp.qtx11extras.virtualFolder  = qtx11extras
+qhp.qtx11extras.subprojects = classes
+qhp.qtx11extras.subprojects.classes.title = Qt X11 Extras C++ Classes
+qhp.qtx11extras.subprojects.classes.selectors = class fake:headerfile
+qhp.qtx11extras.subprojects.classes.sortPages = true
diff --git a/src/x11support/qtx11supportglobal.h b/src/x11extras/qtx11extrasglobal.h
index 054f9a0..0e4b1c4 100644
--- a/src/x11support/qtx11supportglobal.h
+++ b/src/x11extras/qtx11extrasglobal.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTX11SUPPORTGLOBAL_H
-#define QTX11SUPPORTGLOBAL_H
+#ifndef QTX11EXTRASGLOBAL_H
+#define QTX11EXTRASGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
@@ -49,17 +49,17 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_X11SUPPORT_LIB)
-#    define Q_X11SUPPORT_EXPORT Q_DECL_EXPORT
+#  if defined(QT_BUILD_X11EXTRAS_LIB)
+#    define Q_X11EXTRAS_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_X11SUPPORT_EXPORT Q_DECL_IMPORT
+#    define Q_X11EXTRAS_EXPORT Q_DECL_IMPORT
 #  endif
 #else
-#  define Q_X11SUPPORT_EXPORT
+#  define Q_X11EXTRAS_EXPORT
 #endif
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QTX11SUPPORTGLOBAL_H
+#endif // QTX11EXTRASGLOBAL_H
diff --git a/src/x11support/qx11info_x11.cpp b/src/x11extras/qx11info_x11.cpp
index db3c0a1..db3c0a1 100644
--- a/src/x11support/qx11info_x11.cpp
+++ b/src/x11extras/qx11info_x11.cpp
diff --git a/src/x11support/qx11info_x11.h b/src/x11extras/qx11info_x11.h
index 68cb6a8..224d9d4 100644
--- a/src/x11support/qx11info_x11.h
+++ b/src/x11extras/qx11info_x11.h
@@ -43,7 +43,7 @@
 #define QX11INFO_X11_H
 
 #include <QtCore/qnamespace.h>
-#include "QtX11Support/qtx11supportglobal.h"
+#include "QtX11Extras/qtx11extrasglobal.h"
 
 typedef struct _XDisplay Display;
 struct xcb_connection_t;
@@ -52,7 +52,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class Q_X11SUPPORT_EXPORT QX11Info
+class Q_X11EXTRAS_EXPORT QX11Info
 {
 public:
     static int appDpiX(int screen=-1);
diff --git a/src/x11support/x11support.pro b/src/x11extras/x11extras.pro
index fed7d00..80dc421 100644
--- a/src/x11support/x11support.pro
+++ b/src/x11extras/x11extras.pro
@@ -1,8 +1,8 @@
-TARGET     = QtX11Support
+TARGET     = QtX11Extras
 
 DEFINES += QT_NO_USING_NAMESPACE
 
-QMAKE_DOCS = $$PWD/doc/qtx11support.qdocconf
+QMAKE_DOCS = $$PWD/doc/qtx11extras.qdocconf
 
 load(qt_module)
 
diff --git a/sync.profile b/sync.profile
index 2b293ed..b610668 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtX11Support" => "$basedir/src/x11support",
+    "QtX11Extras" => "$basedir/src/x11extras",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/cmake/test_qx11_module/CMakeLists.txt b/tests/auto/cmake/test_qx11_module/CMakeLists.txt
index d6f050e..016cf5f 100644
--- a/tests/auto/cmake/test_qx11_module/CMakeLists.txt
+++ b/tests/auto/cmake/test_qx11_module/CMakeLists.txt
@@ -6,14 +6,14 @@ project(test_qx11_module)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Gui REQUIRED)
 
-find_package(Qt5X11Support REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
 
 include_directories(
-    ${Qt5X11Support_INCLUDE_DIRS}
+    ${Qt5X11Extras_INCLUDE_DIRS}
 )
 
 add_definitions(
-    ${Qt5X11Support_DEFINITIONS}
+    ${Qt5X11Extras_DEFINITIONS}
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
@@ -21,5 +21,5 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
 add_executable(mainapp main.cpp)
 
 target_link_libraries(mainapp
-    ${Qt5X11Support_LIBRARIES}
+    ${Qt5X11Extras_LIBRARIES}
 )
diff --git a/tests/auto/cmake/test_qx11_module/main.cpp b/tests/auto/cmake/test_qx11_module/main.cpp
index 932521f..41f22da 100644
--- a/tests/auto/cmake/test_qx11_module/main.cpp
+++ b/tests/auto/cmake/test_qx11_module/main.cpp
@@ -1,8 +1,8 @@
 
 #include <QX11Info>
-#include <QtX11Support/QX11Info>
-#include <QtX11Support/QtX11Support>
-#include <QtX11Support>
+#include <QtX11Extras/QX11Info>
+#include <QtX11Extras/QtX11Extras>
+#include <QtX11Extras>
 
 int main(int argc, char **argv)
 {
diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro
index 2833705..9059baa 100644
--- a/tests/auto/qx11info/qx11info.pro
+++ b/tests/auto/qx11info/qx11info.pro
@@ -1,4 +1,4 @@
 CONFIG += testcase
 TARGET = tst_qx11info
-QT += x11support widgets testlib
+QT += x11extras widgets testlib
 SOURCES  += tst_qx11info.cpp