diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 10:29:28 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 10:29:28 +0200 |
commit | 1ae5e36baf1ee73c4ba1149a3f2d04942cb71f0f (patch) | |
tree | 8a9354bad67311b96198455b5b3f392acc90682b | |
parent | f67b8df3ebdba2d398b9cce686b7c644adffff08 (diff) |
make the new QtGui compile
-rw-r--r-- | src/gui/guikernel/qguiapplication.cpp | 3 | ||||
-rw-r--r-- | src/gui/text/qcssparser.cpp | 6 | ||||
-rw-r--r-- | src/gui/text/qcssparser_p.h | 4 | ||||
-rw-r--r-- | src/gui/text/qtextdocument.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp index ed3b4c28b0..8f81500823 100644 --- a/src/gui/guikernel/qguiapplication.cpp +++ b/src/gui/guikernel/qguiapplication.cpp @@ -55,6 +55,7 @@ #include <QtCore/private/qabstracteventdispatcher_p.h> #include <QtCore/qmutex.h> #include <QtDebug> +#include <qpalette.h> #include <QtGui/QPlatformIntegration> #include <QtGui/QGenericPluginFactory> @@ -72,6 +73,8 @@ QT_BEGIN_NAMESPACE +bool qt_is_gui_used = true; + Qt::MouseButtons QGuiApplicationPrivate::mouse_buttons = Qt::NoButton; Qt::KeyboardModifiers QGuiApplicationPrivate::modifier_buttons = Qt::NoModifier; diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 052dc72b63..8eb68be207 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -1275,6 +1275,8 @@ void ValueExtractor::extractFont() bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size) { bool hit = false; +#if 0 + // ### Qt5 for (int i = 0; i < declarations.count(); ++i) { const Declaration &decl = declarations.at(i); switch (decl.d->propertyId) { @@ -1295,6 +1297,7 @@ bool ValueExtractor::extractImage(QIcon *icon, Qt::Alignment *a, QSize *size) } hit = true; } +#endif return hit; } @@ -1643,6 +1646,8 @@ void Declaration::borderImageValue(QString *image, int *cuts, *h = *v; } +#if 0 +// ### Qt 5 QIcon Declaration::iconValue() const { if (d->parsed.isValid()) @@ -1689,6 +1694,7 @@ QIcon Declaration::iconValue() const d->parsed = QVariant::fromValue<QIcon>(icon); return icon; } +#endif /////////////////////////////////////////////////////////////////////////////// // Selector 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; }; diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index ee88ab0025..83b875c149 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -54,12 +54,10 @@ #include "qtexthtmlparser_p.h" #include "qpainter.h" #include "qprinter.h" -#include "qtextedit.h" #include <qfile.h> #include <qfileinfo.h> #include <qdir.h> #include "qfont_p.h" -#include "private/qtextedit_p.h" #include "private/qdataurl_p.h" #include "qtextdocument_p.h" diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 2044cf78ce..af32c9f890 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -465,7 +465,7 @@ int QApplicationPrivate::keyboard_input_time = 400; // keyboard input interval #ifndef QT_NO_WHEELEVENT int QApplicationPrivate::wheel_scroll_lines; // number of lines to scroll #endif -bool qt_is_gui_used; +extern bool qt_is_gui_used; bool Q_GUI_EXPORT qt_tab_all_widgets = true; bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; |