diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 17:26:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 17:26:48 (GMT) |
| commit | 7dc1b7b7506b5ba88bccb98ebb38007e2f055336 (patch) | |
| tree | 96b06c06062fe6aa03376a4ea5d369259d2ab800 /src/gui/kernel | |
| parent | de1c505ddb5acedf96168df00172b9e3a694a32d (diff) | |
| parent | 81837e43e3f966c1755e90eb65df6e3bad506ed7 (diff) | |
| download | Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.zip Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.tar.gz Qt-7dc1b7b7506b5ba88bccb98ebb38007e2f055336.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
Symbol visibility fixes for RVCT4 on Symbian
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 e480696..de74f53 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -138,7 +138,7 @@ static void initResources() QT_BEGIN_NAMESPACE -extern void qt_call_post_routines(); +Q_DECL_IMPORT extern 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 b877784..6181b62 100644 --- a/src/gui/kernel/qwhatsthis.cpp +++ b/src/gui/kernel/qwhatsthis.cpp @@ -143,7 +143,7 @@ QT_BEGIN_NAMESPACE \sa QToolTip */ -extern void qDeleteInEventHandler(QObject *o); +Q_DECL_IMPORT extern void qDeleteInEventHandler(QObject *o); class QWhatsThat : public QWidget { |