diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-07 14:04:17 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-10 08:20:53 +0000 |
| commit | 00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1 (patch) | |
| tree | 1a135ec31593b76c38849621f1d4ecc5508266d8 /src/qtwaylandscanner | |
| parent | 762d384b806deb84072a5c7eb6b91afa1e150c1f (diff) | |
Rename QtCompositor to QtWaylandCompositor
enable building QtWaylandCompositor by default
Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 6d602ad08..131c5ca7d 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -370,7 +370,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr printf("#include <QByteArray>\n"); printf("#include <QMultiMap>\n"); printf("#include <QString>\n"); - printf("\n"); printf("\n"); printf("#ifndef WAYLAND_VERSION_CHECK\n"); @@ -382,9 +381,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr printf("\n"); printf("QT_BEGIN_NAMESPACE\n"); - printf("\n"); - printf("class QWaylandExtensionContainer;\n"); - printf("\n"); QByteArray serverExport; if (headerPath.size()) { serverExport = QByteArray("Q_WAYLAND_SERVER_") + preProcessorProtocolName + "_EXPORT"; @@ -533,7 +529,6 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr printf("#include \"qwayland-server-%s.h\"\n", QByteArray(protocolName).replace('_', '-').constData()); else printf("#include <%s/qwayland-server-%s.h>\n", headerPath.constData(), QByteArray(protocolName).replace('_', '-').constData()); - printf("#include <QtCompositor/QWaylandExtension>\n"); printf("\n"); printf("QT_BEGIN_NAMESPACE\n"); printf("\n"); |