get QtWidgets to link

some more changes, mainly exporting methods from
QtGui to get QtWidgets to link.

3 files changed, 5 insertions, 22 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 4e7119fdf9..059c06d162 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -916,10 +916,6 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv,
 
 #endif // Q_WS_X11
 
-extern void qInitDrawhelperAsm();
-extern void qInitImageConversions();
-extern int qRegisterGuiVariant();
-extern int qUnregisterGuiVariant();
 #ifndef QT_NO_STATEMACHINE
 extern int qRegisterGuiStateMachine();
 extern int qUnregisterGuiStateMachine();
@@ -937,8 +933,6 @@ void QApplicationPrivate::initialize()
 
     if (qt_appType != QApplication::Tty)
         (void) QApplication::style();  // trigger creation of application style
-    // trigger registering of QVariant's GUI types
-    qRegisterGuiVariant();
 #ifndef QT_NO_STATEMACHINE
     // trigger registering of QStateMachine's GUI types
     qRegisterGuiStateMachine();
@@ -966,11 +960,6 @@ void QApplicationPrivate::initialize()
 #endif //QT_AUTO_MAXIMIZE_THRESHOLD
 #endif //Q_WS_WINCE
 
-    // Set up which span functions should be used in raster engine...
-    qInitDrawhelperAsm();
-    // and QImage conversion functions
-    qInitImageConversions();
-
 #ifndef QT_NO_WHEELEVENT
     QApplicationPrivate::wheel_scroll_lines = 3;
 #endif
@@ -1160,8 +1149,6 @@ QApplication::~QApplication()
     // trigger unregistering of QStateMachine's GUI types
     qUnregisterGuiStateMachine();
 #endif
-    // trigger unregistering of QVariant's GUI types
-    qUnregisterGuiVariant();
 }
 
 
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index f3e033c787..3930dc8d68 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -393,9 +393,6 @@ void qt_init(QApplicationPrivate *, int type)
 
     qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
     QColormap::initialize();
-#ifndef QT_NO_CURSOR
-//    QCursorData::initialize();
-#endif
 
     qApp->setObjectName(appName);
 
@@ -407,9 +404,6 @@ void qt_init(QApplicationPrivate *, int type)
 void qt_cleanup()
 {
     QPixmapCache::clear();
-#ifndef QT_NO_CURSOR
-    QCursorData::cleanup();
-#endif
     QColormap::cleanup();
     delete QApplicationPrivate::inputContext;
     QApplicationPrivate::inputContext = 0;
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 84272e23fb..750b408bd9 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -978,8 +978,9 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget
                        hintValue = (int) decl.colorValue().rgba();
                    } else if (hintName.endsWith(QLatin1String("size"))) {
                        hintValue = decl.sizeValue();
-                   } else if (hintName.endsWith(QLatin1String("icon"))) {
-                       hintValue = decl.iconValue();
+                       // ### Qt5
+//                   } else if (hintName.endsWith(QLatin1String("icon"))) {
+//                       hintValue = decl.iconValue();
                    } else if (hintName == QLatin1String("button-layout")
                               && decl.d->values.count() != 0 && decl.d->values.at(0).type == Value::String) {
                        hintValue = subControlLayout(decl.d->values.at(0).variant.toString());
@@ -2508,7 +2509,8 @@ void QStyleSheetStyle::setProperties(QWidget *w)
         }
         QVariant v;
         switch (value.type()) {
-        case QVariant::Icon: v = decl.iconValue(); break;
+            // ### Qt 5
+//        case QVariant::Icon: v = decl.iconValue(); break;
         case QVariant::Image: v = QImage(decl.uriValue()); break;
         case QVariant::Pixmap: v = QPixmap(decl.uriValue()); break;
         case QVariant::Rect: v = decl.rectValue(); break;