From 1ae5e36baf1ee73c4ba1149a3f2d04942cb71f0f Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 10:29:28 +0200
Subject: make the new QtGui compile

---
 src/gui/text/qcssparser_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/text/qcssparser_p.h')

diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 86bafc9215..5ede553aa5 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -61,9 +61,9 @@
 #include <QtCore/QMultiHash>
 #include <QtGui/QFont>
 #include <QtGui/QPalette>
-#include <QtGui/QIcon>
 #include <QtCore/QSharedData>
 
+class QIcon;
 
 #ifndef QT_NO_CSSPARSER
 
@@ -453,7 +453,7 @@ struct Q_AUTOTEST_EXPORT Declaration
     QSize sizeValue() const;
     QRect rectValue() const;
     QString uriValue() const;
-    QIcon iconValue() const;
+//    QIcon iconValue() const;
 
     void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
 };
-- 
cgit v1.2.3


From 7ff96330ed28b957a80d294a43748c8051c0e483 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Sat, 7 May 2011 20:56:32 +0200
Subject: get QtWidgets to link

some more changes, mainly exporting methods from
QtGui to get QtWidgets to link.
---
 src/gui/text/qcssparser_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/text/qcssparser_p.h')

diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 5ede553aa5..4fc720fcef 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -633,7 +633,7 @@ enum StyleSheetOrigin {
     StyleSheetOrigin_Inline
 };
 
-struct StyleSheet
+struct Q_GUI_EXPORT StyleSheet
 {
     StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { }
     QVector<StyleRule> styleRules;  //only contains rules that are not indexed
-- 
cgit v1.2.3


From 233411bc1e69ef0ea72b173a7f6b26124c346857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 26 Jul 2011 17:04:08 +0200
Subject: Added Q_GUI_EXPORT for some internal symbols needed in QtWidgets.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1e3ba974ebb1200095ddd32a905acaab3cea1c1e
Reviewed-on: http://codereview.qt.nokia.com/2207
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 src/gui/text/qcssparser_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/text/qcssparser_p.h')

diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 427d8b2bcb..4fa8bb0540 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -416,7 +416,7 @@ struct BorderData {
 // 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
 // 5. Declaration - prop1: value1;
 
-struct Q_AUTOTEST_EXPORT Declaration
+struct Q_GUI_EXPORT Declaration
 {
     struct DeclarationData : public QSharedData
     {
@@ -552,7 +552,7 @@ struct BasicSelector
     Relation relationToNext;
 };
 
-struct Q_AUTOTEST_EXPORT Selector
+struct Q_GUI_EXPORT Selector
 {
     QVector<BasicSelector> basicSelectors;
     int specificity() const;
@@ -565,7 +565,7 @@ struct MediaRule;
 struct PageRule;
 struct ImportRule;
 
-struct Q_AUTOTEST_EXPORT ValueExtractor
+struct Q_GUI_EXPORT ValueExtractor
 {
     ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
 
@@ -739,7 +739,7 @@ struct Q_GUI_EXPORT Symbol
     QString lexem() const;
 };
 
-class Q_AUTOTEST_EXPORT Scanner
+class Q_GUI_EXPORT Scanner
 {
 public:
     static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
-- 
cgit v1.2.3