From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 08:53:17 +0100 Subject: Remove use of QT_MODULE from library These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll --- src/gui/text/qabstracttextdocumentlayout.h | 1 - src/gui/text/qfont.h | 1 - src/gui/text/qfontdatabase.h | 1 - src/gui/text/qfontinfo.h | 1 - src/gui/text/qfontmetrics.h | 1 - src/gui/text/qglyphrun.h | 1 - src/gui/text/qlinecontrol_p.h | 1 - src/gui/text/qplatformfontdatabase_qpa.h | 1 - src/gui/text/qrawfont.h | 1 - src/gui/text/qstatictext.h | 1 - src/gui/text/qsyntaxhighlighter.h | 1 - src/gui/text/qtextcontrol_p.h | 1 - src/gui/text/qtextcursor.h | 1 - src/gui/text/qtextdocument.h | 1 - src/gui/text/qtextdocumentfragment.h | 1 - src/gui/text/qtextdocumentwriter.h | 1 - src/gui/text/qtextformat.h | 1 - src/gui/text/qtextlayout.h | 1 - src/gui/text/qtextlist.h | 1 - src/gui/text/qtextobject.h | 1 - src/gui/text/qtextoption.h | 1 - src/gui/text/qtexttable.h | 1 - 22 files changed, 22 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 15a503cc58..9014775331 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAbstractTextDocumentLayoutPrivate; class QTextBlock; diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 4b1fd27a48..2c4511bd22 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFontPrivate; /* don't touch */ class QStringList; diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index 9df8d8f323..c627c56e4f 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStringList; template class QList; diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index f900eb719f..9a463e4143 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class Q_GUI_EXPORT QFontInfo { diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index b19e94ba4b..a7451d9481 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextCodec; diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index 0e3c24c6ee..f2a17b9884 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGlyphRunPrivate; class Q_GUI_EXPORT QGlyphRun diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h index 323b35020a..4c97acca0c 100644 --- a/src/gui/text/qlinecontrol_p.h +++ b/src/gui/text/qlinecontrol_p.h @@ -68,7 +68,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class Q_GUI_EXPORT QLineControl : public QObject { diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h index ab31f55c55..0f24b0e4b8 100644 --- a/src/gui/text/qplatformfontdatabase_qpa.h +++ b/src/gui/text/qplatformfontdatabase_qpa.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QWritingSystemsPrivate; diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index 4402d88cc5..0a6c09cf54 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QRawFontPrivate; class Q_GUI_EXPORT QRawFont diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h index 631e9ea031..40c32f382d 100644 --- a/src/gui/text/qstatictext.h +++ b/src/gui/text/qstatictext.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStaticTextPrivate; class Q_GUI_EXPORT QStaticText diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h index 278a9ec74b..c5f0f1c96c 100644 --- a/src/gui/text/qsyntaxhighlighter.h +++ b/src/gui/text/qsyntaxhighlighter.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextDocument; class QSyntaxHighlighterPrivate; diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h index fbcbd7f729..dc8631ffa4 100644 --- a/src/gui/text/qtextcontrol_p.h +++ b/src/gui/text/qtextcontrol_p.h @@ -67,7 +67,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyleSheet; class QTextDocument; diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h index b64bbf76d7..efada98ab7 100644 --- a/src/gui/text/qtextcursor.h +++ b/src/gui/text/qtextcursor.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextDocument; class QTextCursorPrivate; diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index 7ecbe78309..fddcb7f194 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextFormatCollection; class QTextListFormat; diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h index ef5372bac8..b3241b799f 100644 --- a/src/gui/text/qtextdocumentfragment.h +++ b/src/gui/text/qtextdocumentfragment.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextStream; class QTextDocument; diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h index b616508483..b396fd4d88 100644 --- a/src/gui/text/qtextdocumentwriter.h +++ b/src/gui/text/qtextdocumentwriter.h @@ -47,7 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextDocumentWriterPrivate; class QIODevice; diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index dd4ba6b2e9..5837fc74fa 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QString; class QVariant; diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 6d22a2773e..c1a3efcc3d 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextEngine; class QFont; diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h index b81d973898..0a760c8128 100644 --- a/src/gui/text/qtextlist.h +++ b/src/gui/text/qtextlist.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextListPrivate; class QTextCursor; diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index a224020827..e42ce428c7 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextObjectPrivate; class QTextDocument; diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 3d76c40dd2..16bdcad7f7 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) template class QList; struct QTextOptionPrivate; diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h index b8d7cd7098..697d416c90 100644 --- a/src/gui/text/qtexttable.h +++ b/src/gui/text/qtexttable.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QTextCursor; class QTextTable; -- cgit v1.2.3