diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2014-10-05 21:20:42 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2014-10-08 13:58:27 +0200 |
commit | 3be9d6d116c68405ae5b0bade624d04975a10c61 (patch) | |
tree | cc148b974c72f53666951f16e6546a4dd14369ee /src | |
parent | 707eb8d28d6bc41a99676eeaec4716d4b2a15427 (diff) |
QCss: unexport some classes
and export only the non-inline functions inside them.
Inline functions don't need exporting, and some compilers
are known to have problems inlining inline functions of
exported classes.
Change-Id: I843adc0ab493817e71f48ab87bfefb03d4ca918d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/text/qcssparser_p.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 4738b0f584..2e13184f07 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -345,7 +345,7 @@ enum StyleFeature { NumKnownStyleFeatures = 4 }; -struct Q_GUI_EXPORT Value +struct Value { enum Type { Unknown, @@ -364,7 +364,8 @@ struct Q_GUI_EXPORT Value inline Value() : type(Unknown) { } Type type; QVariant variant; - QString toString() const; + + Q_GUI_EXPORT QString toString() const; }; struct ColorData { @@ -627,7 +628,7 @@ enum StyleSheetOrigin { StyleSheetOrigin_Inline }; -struct Q_GUI_EXPORT StyleSheet +struct StyleSheet { StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { } QVector<StyleRule> styleRules; //only contains rules that are not indexed @@ -638,7 +639,8 @@ struct Q_GUI_EXPORT StyleSheet int depth; // applicable only for inline style sheets QMultiHash<QString, StyleRule> nameIndex; QMultiHash<QString, StyleRule> idIndex; - void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive); + + Q_GUI_EXPORT void buildIndexes(Qt::CaseSensitivity nameCaseSensitivity = Qt::CaseSensitive); }; class Q_GUI_EXPORT StyleSelector @@ -724,13 +726,13 @@ enum TokenType { OR }; -struct Q_GUI_EXPORT Symbol +struct Symbol { inline Symbol() : token(NONE), start(0), len(-1) {} TokenType token; QString text; int start, len; - QString lexem() const; + Q_GUI_EXPORT QString lexem() const; }; class Q_GUI_EXPORT Scanner |