diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 03:20:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-08 03:20:58 (GMT) |
| commit | 6d9289d1117287acbec162d2e8a26442308c484f (patch) | |
| tree | 60315f9140a019604f9c4325fcd405ee9d180000 /src/gui/kernel | |
| parent | 7d92a635bc21ae64071854f460098deeceb6c199 (diff) | |
| parent | fa6ebe9663fb6f842aec1e0be98a99583ee959f1 (diff) | |
| download | Qt-6d9289d1117287acbec162d2e8a26442308c484f.zip Qt-6d9289d1117287acbec162d2e8a26442308c484f.tar.gz Qt-6d9289d1117287acbec162d2e8a26442308c484f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwhatsthis.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index c9a3e8b..02d732b 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -146,7 +146,7 @@ static void initResources() QT_BEGIN_NAMESPACE -Q_DECL_IMPORT extern void qt_call_post_routines(); +Q_CORE_EXPORT void qt_call_post_routines(); int QApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly, but it's at least 4.0.0 diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp index 6181b62..ff4641e 100644 --- a/src/gui/kernel/qwhatsthis.cpp +++ b/src/gui/kernel/qwhatsthis.cpp @@ -143,7 +143,7 @@ QT_BEGIN_NAMESPACE \sa QToolTip */ -Q_DECL_IMPORT extern void qDeleteInEventHandler(QObject *o); +Q_CORE_EXPORT void qDeleteInEventHandler(QObject *o); class QWhatsThat : public QWidget { |