diff options
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 127 | ||||
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian_p.h | 5 | ||||
-rw-r--r-- | src/gui/egl/egl.pri | 42 | ||||
-rw-r--r-- | src/gui/egl/qegl.cpp | 10 | ||||
-rw-r--r-- | src/gui/egl/qegl_p.h | 4 | ||||
-rw-r--r-- | src/gui/egl/qegl_stub.cpp | 250 | ||||
-rw-r--r-- | src/gui/egl/qeglproperties_p.h | 21 | ||||
-rw-r--r-- | src/gui/egl/qeglproperties_stub.cpp | 138 | ||||
-rw-r--r-- | src/gui/gui.pro | 2 | ||||
-rw-r--r-- | src/gui/painting/qprintengine_ps.cpp | 25 | ||||
-rw-r--r-- | src/gui/widgets/qlineedit.cpp | 10 | ||||
-rw-r--r-- | src/multimedia/audio/qaudioinput_alsa_p.cpp | 9 | ||||
-rw-r--r-- | src/multimedia/audio/qaudiooutput_alsa_p.cpp | 9 | ||||
-rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 280 | ||||
-rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 277 | ||||
-rw-r--r-- | tests/auto/qlineedit/qlineedit.pro | 1 | ||||
-rw-r--r-- | tests/auto/qlineedit/tst_qlineedit.cpp | 33 |
17 files changed, 1059 insertions, 184 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 8c96057..fa337ca 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -43,7 +43,6 @@ #include <private/qthread_p.h> #include <qcoreapplication.h> #include <private/qcoreapplication_p.h> -#include <qdatetime.h> #include <unistd.h> #include <errno.h> @@ -636,6 +635,74 @@ void QSocketActiveObject::deleteLater() } } +#ifdef QT_SYMBIAN_PRIORITY_DROP +class QIdleDetectorThread +{ +public: + QIdleDetectorThread() + : m_state(STATE_RUN), m_stop(false) + { + qt_symbian_throwIfError(m_lock.CreateLocal()); + TInt err = m_idleDetectorThread.Create(KNullDesC(), &idleDetectorThreadFunc, 1024, &User::Allocator(), this); + if (err != KErrNone) + m_lock.Close(); + qt_symbian_throwIfError(err); + m_idleDetectorThread.SetPriority(EPriorityAbsoluteBackgroundNormal); + m_idleDetectorThread.Resume(); + } + + ~QIdleDetectorThread() + { + // close down the idle thread because if corelib is loaded temporarily, this would leak threads into the host process + m_stop = true; + m_lock.Signal(); + m_idleDetectorThread.SetPriority(EPriorityNormal); + TRequestStatus s; + m_idleDetectorThread.Logon(s); + User::WaitForRequest(s); + m_idleDetectorThread.Close(); + m_lock.Close(); + } + + void kick() + { + m_state = STATE_KICKED; + m_lock.Signal(); + } + + bool hasRun() + { + return m_state == STATE_RUN; + } + +private: + static TInt idleDetectorThreadFunc(TAny* self) + { + static_cast<QIdleDetectorThread*>(self)->IdleLoop(); + return KErrNone; + } + + void IdleLoop() + { + while (!m_stop) { + m_lock.Wait(); + m_state = STATE_RUN; + } + } + +private: + enum IdleStates {STATE_KICKED, STATE_RUN} m_state; + bool m_stop; + RThread m_idleDetectorThread; + RFastLock m_lock; +}; + +Q_GLOBAL_STATIC(QIdleDetectorThread, idleDetectorThread); + +const int maxBusyTime = 2000; // maximum time we allow idle detector to be blocked before worrying, in milliseconds +const int baseDelay = 1000; // minimum delay time used when backing off to allow idling, in microseconds +#endif + QEventDispatcherSymbian::QEventDispatcherSymbian(QObject *parent) : QAbstractEventDispatcher(parent), m_activeScheduler(0), @@ -646,11 +713,15 @@ QEventDispatcherSymbian::QEventDispatcherSymbian(QObject *parent) m_iterationCount(0), m_noSocketEvents(false) { +#ifdef QT_SYMBIAN_PRIORITY_DROP + m_delay = baseDelay; + m_avgEventTime = 0; + idleDetectorThread(); +#endif } QEventDispatcherSymbian::~QEventDispatcherSymbian() { - m_processHandle.Close(); } void QEventDispatcherSymbian::startingUp() @@ -711,23 +782,7 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla m_interrupt = false; #ifdef QT_SYMBIAN_PRIORITY_DROP - /* - * This QTime variable is used to measure the time it takes to finish - * the event loop. If we take too long in the loop, other processes - * may be starved and killed. After the first event has completed, we - * take the current time, and if the remaining events take longer than - * a preset time, we temporarily lower the priority to force a context - * switch. For applications that do not take unecessarily long in the - * event loop, the priority will not be altered. - */ - QTime time; - enum { - FirstRun, - SubsequentRun, - TimeStarted - } timeState = FirstRun; - - TProcessPriority priority; + QTime eventTimer; #endif while (1) { @@ -743,10 +798,18 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla } #ifdef QT_SYMBIAN_PRIORITY_DROP - if (timeState == SubsequentRun) { - time.start(); - timeState = TimeStarted; + if (idleDetectorThread()->hasRun()) { + if (m_delay > baseDelay) + m_delay -= baseDelay; + m_lastIdleRequestTimer.start(); + idleDetectorThread()->kick(); + } else if (m_lastIdleRequestTimer.elapsed() > maxBusyTime) { + User::AfterHighRes(m_delay); + // allow delay to be up to 1/4 of execution time + if (!idleDetectorThread()->hasRun() && m_delay*3 < m_avgEventTime) + m_delay += baseDelay; } + eventTimer.start(); #endif TInt error; @@ -756,6 +819,12 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla CActiveScheduler::Current()->Error(error); } +#ifdef QT_SYMBIAN_PRIORITY_DROP + int eventDur = eventTimer.elapsed()*1000; + // average is calcualted as a 5% decaying exponential average + m_avgEventTime = (m_avgEventTime * 95 + eventDur * 5) / 100; +#endif + if (!handledSymbianEvent) { qFatal("QEventDispatcherSymbian::processEvents(): Caught Symbian stray signal"); } @@ -764,20 +833,6 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla break; } block = false; -#ifdef QT_SYMBIAN_PRIORITY_DROP - if (timeState == TimeStarted && time.elapsed() > 100) { - priority = m_processHandle.Priority(); - m_processHandle.SetPriority(EPriorityBackground); - time.start(); - // Slight chance of race condition in the next lines, but nothing fatal - // will happen, just wrong priority. - if (m_processHandle.Priority() == EPriorityBackground) { - m_processHandle.SetPriority(priority); - } - } - if (timeState == FirstRun) - timeState = SubsequentRun; -#endif }; emit awake(); diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h index 1ab31cc..8a9c9a0 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian_p.h +++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h @@ -62,6 +62,7 @@ #include <qmutex.h> #include <qwaitcondition.h> #include <qsocketnotifier.h> +#include <qdatetime.h> #include <e32base.h> @@ -279,7 +280,9 @@ private: QList<QActiveObject *> m_deferredActiveObjects; - RProcess m_processHandle; + int m_delay; + int m_avgEventTime; + QTime m_lastIdleRequestTimer; }; #ifdef QT_DEBUG diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri index 669d311..bf25438 100644 --- a/src/gui/egl/egl.pri +++ b/src/gui/egl/egl.pri @@ -1,23 +1,29 @@ -CONFIG += egl +contains(QT_CONFIG, egl): { + CONFIG += egl -HEADERS += \ - egl/qegl_p.h \ - egl/qeglproperties_p.h + HEADERS += \ + egl/qegl_p.h \ + egl/qeglproperties_p.h -SOURCES += \ - egl/qegl.cpp \ - egl/qeglproperties.cpp + SOURCES += \ + egl/qegl.cpp \ + egl/qeglproperties.cpp -wince*: SOURCES += egl/qegl_wince.cpp + wince*: SOURCES += egl/qegl_wince.cpp -unix { - embedded { - SOURCES += egl/qegl_qws.cpp - } else { - symbian { - SOURCES += egl/qegl_symbian.cpp - } else { - SOURCES += egl/qegl_x11.cpp - } - } + unix { + embedded { + SOURCES += egl/qegl_qws.cpp + } else { + symbian { + SOURCES += egl/qegl_symbian.cpp + } else { + SOURCES += egl/qegl_x11.cpp + } + } + } +} else:symbian { + DEFINES += QT_NO_EGL + SOURCES += egl/qegl_stub.cpp + SOURCES += egl/qeglproperties_stub.cpp } diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index 0ed95ea..ee19216 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -333,6 +333,16 @@ bool QEglContext::configAttrib(int name, EGLint *value) const return eglGetConfigAttrib(display(), cfg, name, value); } +void QEglContext::clearError() +{ + eglGetError(); +} + +EGLint QEglContext::error() +{ + return eglGetError(); +} + // Retrieve all of the properties on "cfg". If zero, return // the context's configuration. QEglProperties QEglContext::configProperties(EGLConfig cfg) const diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index 87ed818..e08e1dd 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -102,8 +102,8 @@ public: bool configAttrib(int name, EGLint *value) const; - static void clearError() { eglGetError(); } - static EGLint error() { return eglGetError(); } + static void clearError(); + static EGLint error(); static QString errorString(EGLint code); static EGLDisplay display(); diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp new file mode 100644 index 0000000..0363103 --- /dev/null +++ b/src/gui/egl/qegl_stub.cpp @@ -0,0 +1,250 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtGui/qpaintdevice.h> +#include <QtGui/qpixmap.h> +#include <QtGui/qwidget.h> +#include <QtCore/qdebug.h> + +#include "qegl_p.h" + +QT_BEGIN_NAMESPACE + +static void noegl(const char *fn) +{ + qWarning() << fn << " called, but Qt configured without EGL" << endl; +} + +#define NOEGL noegl(__FUNCTION__); + +EGLDisplay QEglContext::dpy = 0; + +QEglContext::QEglContext() + : apiType(QEgl::OpenGL) + , ctx(0) + , cfg(0) + , currentSurface(0) + , current(false) + , ownsContext(true) + , sharing(false) +{ + NOEGL +} + +QEglContext::~QEglContext() +{ + NOEGL +} + +bool QEglContext::isValid() const +{ + NOEGL + return false; +} + +bool QEglContext::isCurrent() const +{ + NOEGL + return false; +} + +bool QEglContext::chooseConfig(const QEglProperties& properties, QEgl::PixelFormatMatch match) +{ + Q_UNUSED(properties) + Q_UNUSED(match) + NOEGL + return false; +} + +EGLSurface QEglContext::createSurface(QPaintDevice* device, const QEglProperties *properties) +{ + Q_UNUSED(device) + Q_UNUSED(properties) + NOEGL + return 0; +} + + +// Create the EGLContext. +bool QEglContext::createContext(QEglContext *shareContext, const QEglProperties *properties) +{ + Q_UNUSED(shareContext) + Q_UNUSED(properties) + NOEGL + return false; +} + +// Destroy an EGL surface object. If it was current on this context +// then call doneCurrent() for it first. +void QEglContext::destroySurface(EGLSurface surface) +{ + Q_UNUSED(surface) + NOEGL +} + +// Destroy the context. Note: this does not destroy the surface. +void QEglContext::destroyContext() +{ + NOEGL +} + +bool QEglContext::makeCurrent(EGLSurface surface) +{ + Q_UNUSED(surface) + NOEGL + return false; +} + +bool QEglContext::doneCurrent() +{ + NOEGL + return false; +} + +// Act as though doneCurrent() was called, but keep the context +// and the surface active for the moment. This allows makeCurrent() +// to skip a call to eglMakeCurrent() if we are using the same +// surface as the last set of painting operations. We leave the +// currentContext() pointer as-is for now. +bool QEglContext::lazyDoneCurrent() +{ + NOEGL + return false; +} + +bool QEglContext::swapBuffers(EGLSurface surface) +{ + Q_UNUSED(surface) + NOEGL + return false; +} + +bool QEglContext::configAttrib(int name, EGLint *value) const +{ + Q_UNUSED(name) + Q_UNUSED(value) + NOEGL + return false; +} + +void QEglContext::clearError() +{ + NOEGL + return; +} + +EGLint QEglContext::error() +{ + NOEGL + return 0; +} + +EGLDisplay QEglContext::display() +{ + NOEGL + return 0; +} + +// Return the error string associated with a specific code. +QString QEglContext::errorString(EGLint code) +{ + Q_UNUSED(code) + NOEGL + return QString(); +} + +// Dump all of the EGL configurations supported by the system. +void QEglContext::dumpAllConfigs() +{ + NOEGL +} + +QString QEglContext::extensions() +{ + NOEGL + return QString(); +} + +bool QEglContext::hasExtension(const char* extensionName) +{ + Q_UNUSED(extensionName) + NOEGL + return false; +} + +QEglContext *QEglContext::currentContext(QEgl::API api) +{ + Q_UNUSED(api) + NOEGL + return false; +} + +void QEglContext::setCurrentContext(QEgl::API api, QEglContext *context) +{ + Q_UNUSED(api) + Q_UNUSED(context) + NOEGL +} + +EGLNativeDisplayType QEglContext::nativeDisplay() +{ + NOEGL + return 0; +} + +void QEglContext::waitClient() +{ + NOEGL +} + +void QEglContext::waitNative() +{ + NOEGL +} + +QEglProperties QEglContext::configProperties(EGLConfig cfg) const +{ + Q_UNUSED(cfg) + NOEGL + return QEglProperties(); +} + +QT_END_NAMESPACE diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h index 43c3393..b385773 100644 --- a/src/gui/egl/qeglproperties_p.h +++ b/src/gui/egl/qeglproperties_p.h @@ -58,6 +58,7 @@ QT_BEGIN_INCLUDE_NAMESPACE +#ifndef QT_NO_EGL #if defined(QT_OPENGL_ES_2) # include <GLES2/gl2.h> #endif @@ -67,6 +68,24 @@ QT_BEGIN_INCLUDE_NAMESPACE #else # include <EGL/egl.h> #endif +#else + +//types from egltypes.h for compiling stub without EGL headers +typedef int EGLBoolean; +typedef int EGLint; +typedef int EGLenum; +typedef int NativeDisplayType; +typedef void* NativeWindowType; +typedef void* NativePixmapType; +typedef int EGLDisplay; +typedef int EGLConfig; +typedef int EGLSurface; +typedef int EGLContext; +typedef int EGLClientBuffer; +#define EGL_NONE 0x3038 /* Attrib list terminator */ + +#endif + #if defined(Q_WS_X11) @@ -103,7 +122,7 @@ namespace QEgl { ExactPixelFormat, BestPixelFormat }; -}; +} class QX11Info; class QPaintDevice; diff --git a/src/gui/egl/qeglproperties_stub.cpp b/src/gui/egl/qeglproperties_stub.cpp new file mode 100644 index 0000000..bf5e47b --- /dev/null +++ b/src/gui/egl/qeglproperties_stub.cpp @@ -0,0 +1,138 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore/qdebug.h> +#include <QtCore/qstringlist.h> + +#include "qeglproperties_p.h" + +QT_BEGIN_NAMESPACE + +static void noegl(const char *fn) +{ + qWarning() << fn << " called, but Qt configured without EGL" << endl; +} + +#define NOEGL noegl(__FUNCTION__); + +// Initialize a property block. +QEglProperties::QEglProperties() +{ + NOEGL +} + +QEglProperties::QEglProperties(EGLConfig cfg) +{ + Q_UNUSED(cfg) + NOEGL +} + +// Fetch the current value associated with a property. +int QEglProperties::value(int name) const +{ + Q_UNUSED(name) + NOEGL + return 0; +} + +// Set the value associated with a property, replacing an existing +// value if there is one. +void QEglProperties::setValue(int name, int value) +{ + Q_UNUSED(name) + Q_UNUSED(value) + NOEGL +} + +// Remove a property value. Returns false if the property is not present. +bool QEglProperties::removeValue(int name) +{ + Q_UNUSED(name) + NOEGL + return false; +} + +// Sets the red, green, blue, and alpha sizes based on a pixel format. +// Normally used to match a configuration request to the screen format. +void QEglProperties::setPixelFormat(QImage::Format pixelFormat) +{ + Q_UNUSED(pixelFormat) + NOEGL + +} + +void QEglProperties::setRenderableType(QEgl::API api) +{ + Q_UNUSED(api); + NOEGL +} + +// Reduce the complexity of a configuration request to ask for less +// because the previous request did not result in success. Returns +// true if the complexity was reduced, or false if no further +// reductions in complexity are possible. +bool QEglProperties::reduceConfiguration() +{ + NOEGL + return false; +} + +// Convert a property list to a string suitable for debug output. +QString QEglProperties::toString() const +{ + NOEGL + return QString(); +} + +void QEglProperties::setPaintDeviceFormat(QPaintDevice *dev) +{ + Q_UNUSED(dev) + NOEGL +} + +void QEglProperties::dumpAllConfigs() +{ + NOEGL +} + +QT_END_NAMESPACE + + diff --git a/src/gui/gui.pro b/src/gui/gui.pro index d2401f4..8b58835 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -40,7 +40,7 @@ include(statemachine/statemachine.pri) include(math3d/math3d.pri) include(effects/effects.pri) -contains(QT_CONFIG, egl): include(egl/egl.pri) +include(egl/egl.pri) embedded: QT += network diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp index ac94de3..28e9a7a 100644 --- a/src/gui/painting/qprintengine_ps.cpp +++ b/src/gui/painting/qprintengine_ps.cpp @@ -485,7 +485,6 @@ void QPSPrintEnginePrivate::emitHeader(bool finished) QByteArray header; QPdf::ByteStream s(&header); - s << "%!PS-Adobe-1.0"; qreal scale = 72. / ((qreal) q->metric(QPaintDevice::PdmDpiY)); QRect pageRect = this->pageRect(); @@ -497,28 +496,32 @@ void QPSPrintEnginePrivate::emitHeader(bool finished) int width = pageRect.width(); int height = pageRect.height(); if (finished && pageCount == 1 && copies == 1 && - ((fullPage && qt_gen_epsf) || (outputFileName.endsWith(QLatin1String(".eps")))) - ) { + ((fullPage && qt_gen_epsf) || (outputFileName.endsWith(QLatin1String(".eps"))))) + { + // According to the EPSF 3.0 spec it is required that the PS + // version is PS-Adobe-3.0 + s << "%!PS-Adobe-3.0"; if (!boundingBox.isValid()) boundingBox.setRect(0, 0, width, height); if (orientation == QPrinter::Landscape) { if (!fullPage) boundingBox.translate(-mleft, -mtop); s << " EPSF-3.0\n%%BoundingBox: " - << (int)(printer->height() - boundingBox.bottom())*scale // llx - << (int)(printer->width() - boundingBox.right())*scale - 1 // lly - << (int)(printer->height() - boundingBox.top())*scale + 1 // urx - << (int)(printer->width() - boundingBox.left())*scale; // ury + << int((printer->height() - boundingBox.bottom())*scale) // llx + << int((printer->width() - boundingBox.right())*scale - 1) // lly + << int((printer->height() - boundingBox.top())*scale + 1) // urx + << int((printer->width() - boundingBox.left())*scale); // ury } else { if (!fullPage) boundingBox.translate(mleft, -mtop); s << " EPSF-3.0\n%%BoundingBox: " - << (int)(boundingBox.left())*scale - << (int)(printer->height() - boundingBox.bottom())*scale - 1 - << (int)(boundingBox.right())*scale + 1 - << (int)(printer->height() - boundingBox.top())*scale; + << int((boundingBox.left())*scale) + << int((printer->height() - boundingBox.bottom())*scale - 1) + << int((boundingBox.right())*scale + 1) + << int((printer->height() - boundingBox.top())*scale); } } else { + s << "%!PS-Adobe-1.0"; int w = width + (fullPage ? 0 : mleft + mright); int h = height + (fullPage ? 0 : mtop + mbottom); w = (int)(w*scale); diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 2d2df92..f041a36 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -738,8 +738,14 @@ bool QLineEdit::validateAndSet(const QString &newText, int newPos, setText(oldText); return false; } - setCursorPosition(newPos); - setSelection(qMin(newMarkAnchor, newMarkDrag), qAbs(newMarkAnchor - newMarkDrag)); + int selstart = qMin(newMarkAnchor, newMarkDrag); + int sellength = qAbs(newMarkAnchor - newMarkDrag); + if (selstart == newPos) { + selstart = qMax(newMarkAnchor, newMarkDrag); + sellength = -sellength; + } + //setSelection also set the position + setSelection(selstart, sellength); return true; } #endif //QT3_SUPPORT diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp index 6b15008..c9a8b71 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp @@ -58,8 +58,6 @@ QT_BEGIN_NAMESPACE //#define DEBUG_AUDIO 1 -static const int minimumIntervalTime = 50; - QAudioInputPrivate::QAudioInputPrivate(const QByteArray &device, const QAudioFormat& audioFormat): settings(audioFormat) { @@ -594,10 +592,7 @@ int QAudioInputPrivate::periodSize() const void QAudioInputPrivate::setNotifyInterval(int ms) { - if(ms >= minimumIntervalTime) - intervalTime = ms; - else - intervalTime = minimumIntervalTime; + intervalTime = qMax(0, ms); } int QAudioInputPrivate::notifyInterval() const @@ -649,7 +644,7 @@ bool QAudioInputPrivate::deviceReady() if(deviceState != QAudio::ActiveState) return true; - if((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) { + if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) { emit notify(); elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime; timeStamp.restart(); diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp index afae8b7..49b32c0 100644 --- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp +++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp @@ -58,8 +58,6 @@ QT_BEGIN_NAMESPACE //#define DEBUG_AUDIO 1 -static const int minimumIntervalTime = 50; - QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat): settings(audioFormat) { @@ -573,10 +571,7 @@ int QAudioOutputPrivate::bufferSize() const void QAudioOutputPrivate::setNotifyInterval(int ms) { - if(ms >= minimumIntervalTime) - intervalTime = ms; - else - intervalTime = minimumIntervalTime; + intervalTime = qMax(0, ms); } int QAudioOutputPrivate::notifyInterval() const @@ -718,7 +713,7 @@ bool QAudioOutputPrivate::deviceReady() if(deviceState != QAudio::ActiveState) return true; - if((timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) { + if(intervalTime && (timeStamp.elapsed() + elapsedTimeOffset) > intervalTime) { emit notify(); elapsedTimeOffset = timeStamp.elapsed() + elapsedTimeOffset - intervalTime; timeStamp.restart(); diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index dad9e6c..c7a23fb 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12551,67 +12551,249 @@ EXPORTS ?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12550 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float) ?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12551 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const ?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12552 NONAME ABSENT ; enum QEgl::API QEglContext::api(void) const - ?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ABSENT ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch) - ?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ABSENT ; void QEglContext::destroySurface(int) - ?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ABSENT ; bool QEglContext::lazyDoneCurrent(void) + ?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch) + ?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ; void QEglContext::destroySurface(int) + ?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ; bool QEglContext::lazyDoneCurrent(void) ?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ABSENT ; void QEglContext::waitNative(void) ?context@QEglContext@@QBEHXZ @ 12557 NONAME ABSENT ; int QEglContext::context(void) const - ?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ABSENT ; bool QEglContext::configAttrib(int, int *) const - ??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ABSENT ; QEglProperties::QEglProperties(class QEglProperties const &) + ?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ; bool QEglContext::configAttrib(int, int *) const + ??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ; QEglProperties::QEglProperties(class QEglProperties const &) ?config@QEglContext@@QBEHXZ @ 12560 NONAME ABSENT ; int QEglContext::config(void) const ?openDisplay@QEglContext@@QAE_NPAVQPaintDevice@@@Z @ 12561 NONAME ABSENT ; bool QEglContext::openDisplay(class QPaintDevice *) ?error@QEglContext@@SAHXZ @ 12562 NONAME ABSENT ; int QEglContext::error(void) - ?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ABSENT ; bool QEglContext::swapBuffers(int) - ?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12564 NONAME ABSENT ; void QEglContext::setApi(enum QEgl::API) - ?makeCurrent@QEglContext@@QAE_NH@Z @ 12565 NONAME ABSENT ; bool QEglContext::makeCurrent(int) - ?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12566 NONAME ABSENT ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *) - ?dumpAllConfigs@QEglContext@@QAEXXZ @ 12567 NONAME ABSENT ; void QEglContext::dumpAllConfigs(void) - ?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12568 NONAME ABSENT ; bool QEglProperties::reduceConfiguration(void) - ?removeValue@QEglProperties@@QAE_NH@Z @ 12569 NONAME ABSENT ; bool QEglProperties::removeValue(int) - ?toString@QEglProperties@@QBE?AVQString@@XZ @ 12570 NONAME ABSENT ; class QString QEglProperties::toString(void) const - ?dumpAllConfigs@QEglProperties@@SAXXZ @ 12571 NONAME ABSENT ; void QEglProperties::dumpAllConfigs(void) + ?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ; bool QEglContext::swapBuffers(int) + ?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12564 NONAME ; void QEglContext::setApi(enum QEgl::API) + ?makeCurrent@QEglContext@@QAE_NH@Z @ 12565 NONAME ; bool QEglContext::makeCurrent(int) + ?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12566 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *) + ?dumpAllConfigs@QEglContext@@QAEXXZ @ 12567 NONAME ; void QEglContext::dumpAllConfigs(void) + ?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12568 NONAME ; bool QEglProperties::reduceConfiguration(void) + ?removeValue@QEglProperties@@QAE_NH@Z @ 12569 NONAME ; bool QEglProperties::removeValue(int) + ?toString@QEglProperties@@QBE?AVQString@@XZ @ 12570 NONAME ; class QString QEglProperties::toString(void) const + ?dumpAllConfigs@QEglProperties@@SAXXZ @ 12571 NONAME ; void QEglProperties::dumpAllConfigs(void) ?defaultDisplay@QEglContext@@SAHPAVQPaintDevice@@@Z @ 12572 NONAME ABSENT ; int QEglContext::defaultDisplay(class QPaintDevice *) ?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12573 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(int) const - ?properties@QEglProperties@@QBEPBHXZ @ 12574 NONAME ABSENT ; int const * QEglProperties::properties(void) const - ??0QEglContext@@QAE@XZ @ 12575 NONAME ABSENT ; QEglContext::QEglContext(void) - ??1QEglContext@@QAE@XZ @ 12576 NONAME ABSENT ; QEglContext::~QEglContext(void) - ?isValid@QEglContext@@QBE_NXZ @ 12577 NONAME ABSENT ; bool QEglContext::isValid(void) const - ?value@QEglProperties@@QBEHH@Z @ 12578 NONAME ABSENT ; int QEglProperties::value(int) const + ?properties@QEglProperties@@QBEPBHXZ @ 12574 NONAME ; int const * QEglProperties::properties(void) const + ??0QEglContext@@QAE@XZ @ 12575 NONAME ; QEglContext::QEglContext(void) + ??1QEglContext@@QAE@XZ @ 12576 NONAME ; QEglContext::~QEglContext(void) + ?isValid@QEglContext@@QBE_NXZ @ 12577 NONAME ; bool QEglContext::isValid(void) const + ?value@QEglProperties@@QBEHH@Z @ 12578 NONAME ; int QEglProperties::value(int) const ?clearError@QEglContext@@SAXXZ @ 12579 NONAME ABSENT ; void QEglContext::clearError(void) - ??0QEglProperties@@QAE@H@Z @ 12580 NONAME ABSENT ; QEglProperties::QEglProperties(int) - ?setValue@QEglProperties@@QAEXHH@Z @ 12581 NONAME ABSENT ; void QEglProperties::setValue(int, int) - ?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12582 NONAME ABSENT ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *) + ??0QEglProperties@@QAE@H@Z @ 12580 NONAME ; QEglProperties::QEglProperties(int) + ?setValue@QEglProperties@@QAEXHH@Z @ 12581 NONAME ; void QEglProperties::setValue(int, int) + ?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12582 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *) ?destroy@QEglContext@@QAEXXZ @ 12583 NONAME ABSENT ; void QEglContext::destroy(void) - ?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12584 NONAME ABSENT ; void QEglProperties::setRenderableType(enum QEgl::API) - ?setContext@QEglContext@@QAEXH@Z @ 12585 NONAME ABSENT ; void QEglContext::setContext(int) + ?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12584 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API) + ?setContext@QEglContext@@QAEXH@Z @ 12585 NONAME ; void QEglContext::setContext(int) ?waitClient@QEglContext@@QAEXXZ @ 12586 NONAME ABSENT ; void QEglContext::waitClient(void) - ?isEmpty@QEglProperties@@QBE_NXZ @ 12587 NONAME ABSENT ; bool QEglProperties::isEmpty(void) const + ?isEmpty@QEglProperties@@QBE_NXZ @ 12587 NONAME ; bool QEglProperties::isEmpty(void) const ?getDisplay@QEglContext@@CAHPAVQPaintDevice@@@Z @ 12588 NONAME ABSENT ; int QEglContext::getDisplay(class QPaintDevice *) - ?isSharing@QEglContext@@QBE_NXZ @ 12589 NONAME ABSENT ; bool QEglContext::isSharing(void) const - ?isCurrent@QEglContext@@QBE_NXZ @ 12590 NONAME ABSENT ; bool QEglContext::isCurrent(void) const - ??0QEglProperties@@QAE@XZ @ 12591 NONAME ABSENT ; QEglProperties::QEglProperties(void) + ?isSharing@QEglContext@@QBE_NXZ @ 12589 NONAME ; bool QEglContext::isSharing(void) const + ?isCurrent@QEglContext@@QBE_NXZ @ 12590 NONAME ; bool QEglContext::isCurrent(void) const + ??0QEglProperties@@QAE@XZ @ 12591 NONAME ; QEglProperties::QEglProperties(void) ?extensions@QEglContext@@SA?AVQString@@XZ @ 12592 NONAME ABSENT ; class QString QEglContext::extensions(void) - ?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12593 NONAME ABSENT ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *) - ??1QEglProperties@@QAE@XZ @ 12594 NONAME ABSENT ; QEglProperties::~QEglProperties(void) - ?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12595 NONAME ABSENT ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *) - ?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ABSENT ; void QEglContext::setConfig(int) + ?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12593 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *) + ??1QEglProperties@@QAE@XZ @ 12594 NONAME ; QEglProperties::~QEglProperties(void) + ?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12595 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *) + ?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ; void QEglContext::setConfig(int) ?hasExtension@QEglContext@@SA_NPBD@Z @ 12597 NONAME ABSENT ; bool QEglContext::hasExtension(char const *) - ?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ABSENT ; bool QEglContext::doneCurrent(void) - ?display@QEglContext@@QBEHXZ @ 12599 NONAME ABSENT ; int QEglContext::display(void) const - ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ABSENT ; void QEglProperties::setPixelFormat(enum QImage::Format) - ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ABSENT ; class QEglContext * QEglContext::currentContext(enum QEgl::API) - ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int) + ?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ; bool QEglContext::doneCurrent(void) + ?display@QEglContext@@QBEHXZ @ 12599 NONAME ; int QEglContext::display(void) const + ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format) + ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API) + ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ; class QString QEglContext::errorString(int) ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; bool QFontDatabase::removeAllApplicationFonts() - ?display@QEglContext@@SAHXZ @ 12604 NONAME ABSENT ; int QEglContext::display(void) - ?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12605 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool) - ?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12606 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation) - ?updateDisplayText@QLineControl@@AAEX_N@Z @ 12607 NONAME ; void QLineControl::updateDisplayText(bool) - ?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12608 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &) - ?nativeDisplay@QEglContext@@CAHXZ @ 12609 NONAME ABSENT ; int QEglContext::nativeDisplay(void) - ?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12610 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *) - ?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12611 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *) - ?destroyContext@QEglContext@@QAEXXZ @ 12612 NONAME ABSENT ; void QEglContext::destroyContext(void) - ?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12613 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &) - ?dpy@QEglContext@@0HA @ 12614 NONAME ; int QEglContext::dpy - ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12615 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool) + ??0FileInfo@QZipReader@@QAE@XZ @ 12604 NONAME ABSENT ; QZipReader::FileInfo::FileInfo(void) + ??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12605 NONAME ABSENT ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void) + ??0QGraphicsViewPrivate@@QAE@XZ @ 12606 NONAME ABSENT ; QGraphicsViewPrivate::QGraphicsViewPrivate(void) + ??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12607 NONAME ABSENT ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat) + ??0QStaticText@@QAE@ABV0@@Z @ 12608 NONAME ABSENT ; QStaticText::QStaticText(class QStaticText const &) + ??0QStaticText@@QAE@ABVQString@@ABVQSizeF@@@Z @ 12609 NONAME ABSENT ; QStaticText::QStaticText(class QString const &, class QSizeF const &) + ??0QStaticText@@QAE@XZ @ 12610 NONAME ABSENT ; QStaticText::QStaticText(void) + ??0QStaticTextItem@@QAE@XZ @ 12611 NONAME ABSENT ; QStaticTextItem::QStaticTextItem(void) + ??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12612 NONAME ABSENT ; QZipReader::QZipReader(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>) + ??0QZipReader@@QAE@PAVQIODevice@@@Z @ 12613 NONAME ABSENT ; QZipReader::QZipReader(class QIODevice *) + ??1FileInfo@QZipReader@@QAE@XZ @ 12614 NONAME ABSENT ; QZipReader::FileInfo::~FileInfo(void) + ??1QAbstractScrollAreaPrivate@@UAE@XZ @ 12615 NONAME ABSENT ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(void) + ??1QGraphicsViewPrivate@@UAE@XZ @ 12616 NONAME ABSENT ; QGraphicsViewPrivate::~QGraphicsViewPrivate(void) + ??1QStaticText@@QAE@XZ @ 12617 NONAME ABSENT ; QStaticText::~QStaticText(void) + ??1QStaticTextItem@@QAE@XZ @ 12618 NONAME ABSENT ; QStaticTextItem::~QStaticTextItem(void) + ??1QZipReader@@QAE@XZ @ 12619 NONAME ABSENT ; QZipReader::~QZipReader(void) + ??4FileInfo@QZipReader@@QAEAAU01@ABU01@@Z @ 12620 NONAME ABSENT ; struct QZipReader::FileInfo & QZipReader::FileInfo::operator=(struct QZipReader::FileInfo const &) + ??4QStaticText@@QAEAAV0@ABV0@@Z @ 12621 NONAME ABSENT ; class QStaticText & QStaticText::operator=(class QStaticText const &) + ??8QStaticText@@QBE_NABV0@@Z @ 12622 NONAME ABSENT ; bool QStaticText::operator==(class QStaticText const &) const + ??9QStaticText@@QBE_NABV0@@Z @ 12623 NONAME ABSENT ; bool QStaticText::operator!=(class QStaticText const &) const + ??_EQAbstractScrollAreaPrivate@@UAE@I@Z @ 12624 NONAME ABSENT ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(unsigned int) + ??_EQGraphicsViewPrivate@@UAE@I@Z @ 12625 NONAME ABSENT ; QGraphicsViewPrivate::~QGraphicsViewPrivate(unsigned int) + ?_q_hslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12626 NONAME ABSENT ; void QAbstractScrollAreaPrivate::_q_hslide(int) + ?_q_setViewportCursor@QGraphicsViewPrivate@@QAEXABVQCursor@@@Z @ 12627 NONAME ABSENT ; void QGraphicsViewPrivate::_q_setViewportCursor(class QCursor const &) + ?_q_showOrHideScrollBars@QAbstractScrollAreaPrivate@@QAEXXZ @ 12628 NONAME ABSENT ; void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars(void) + ?_q_unsetViewportCursor@QGraphicsViewPrivate@@QAEXXZ @ 12629 NONAME ABSENT ; void QGraphicsViewPrivate::_q_unsetViewportCursor(void) + ?_q_vslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12630 NONAME ABSENT ; void QAbstractScrollAreaPrivate::_q_vslide(int) + ?allocStyleOptionsArray@QGraphicsViewPrivate@@QAEPAVQStyleOptionGraphicsItem@@H@Z @ 12631 NONAME ABSENT ; class QStyleOptionGraphicsItem * QGraphicsViewPrivate::allocStyleOptionsArray(int) + ?anchorAt@QPlainTextEdit@@QBE?AVQString@@ABVQPoint@@@Z @ 12632 NONAME ABSENT ; class QString QPlainTextEdit::anchorAt(class QPoint const &) const + ?assign@QKeySequence@@AAEHABVQString@@W4SequenceFormat@1@@Z @ 12633 NONAME ABSENT ; int QKeySequence::assign(class QString const &, enum QKeySequence::SequenceFormat) + ?autoFillBackground@QGraphicsWidget@@QBE_NXZ @ 12634 NONAME ABSENT ; bool QGraphicsWidget::autoFillBackground(void) const + ?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12635 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation) + ?centerView@QGraphicsViewPrivate@@QAEXW4ViewportAnchor@QGraphicsView@@@Z @ 12636 NONAME ABSENT ; void QGraphicsViewPrivate::centerView(enum QGraphicsView::ViewportAnchor) + ?clearUndoRedoStacks@QTextDocument@@QAEXW4Stacks@1@@Z @ 12637 NONAME ABSENT ; void QTextDocument::clearUndoRedoStacks(enum QTextDocument::Stacks) + ?close@QZipReader@@QAEXXZ @ 12638 NONAME ABSENT ; void QZipReader::close(void) + ?constBits@QImage@@QBEPBEXZ @ 12639 NONAME ABSENT ; unsigned char const * QImage::constBits(void) const + ?constScanLine@QImage@@QBEPBEH@Z @ 12640 NONAME ABSENT ; unsigned char const * QImage::constScanLine(int) const + ?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12641 NONAME ABSENT ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const + ?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12642 NONAME ABSENT ; bool QPixmap::convertFromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>) + ?count@QZipReader@@QBEHXZ @ 12643 NONAME ABSENT ; int QZipReader::count(void) const + ?create@Fragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12644 NONAME ABSENT ; class QPainter::Fragment QPainter::Fragment::create(class QPointF const &, class QRectF const &, float, float, float, float) + ?detach@QStaticText@@AAEXXZ @ 12645 NONAME ABSENT ; void QStaticText::detach(void) + ?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12646 NONAME ABSENT ; void QFileSystemModel::directoryLoaded(class QString const &) + ?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12647 NONAME ABSENT ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void) + ?drawPixmapFragments@QPaintEngineEx@@UAEXPBVFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12648 NONAME ABSENT ; void QPaintEngineEx::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>) + ?drawPixmapFragments@QPainter@@QAEXPBVFragment@1@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12649 NONAME ABSENT ; void QPainter::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>) + ?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12650 NONAME ABSENT ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &) + ?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12651 NONAME ABSENT ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &) + ?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12652 NONAME ABSENT ; void QPainter::drawStaticText(int, int, class QStaticText const &) + ?entryInfoAt@QZipReader@@QBE?AUFileInfo@1@H@Z @ 12653 NONAME ABSENT ; struct QZipReader::FileInfo QZipReader::entryInfoAt(int) const + ?exists@QZipReader@@QBE_NXZ @ 12654 NONAME ABSENT ; bool QZipReader::exists(void) const + ?extractAll@QZipReader@@QBE_NABVQString@@@Z @ 12655 NONAME ABSENT ; bool QZipReader::extractAll(class QString const &) const + ?fileData@QZipReader@@QBE?AVQByteArray@@ABVQString@@@Z @ 12656 NONAME ABSENT ; class QByteArray QZipReader::fileData(class QString const &) const + ?fileInfoList@QZipReader@@QBE?AV?$QList@UFileInfo@QZipReader@@@@XZ @ 12657 NONAME ABSENT ; class QList<struct QZipReader::FileInfo> QZipReader::fileInfoList(void) const + ?findItems@QGraphicsViewPrivate@@QBE?AV?$QList@PAVQGraphicsItem@@@@ABVQRegion@@PA_NABVQTransform@@@Z @ 12658 NONAME ABSENT ; class QList<class QGraphicsItem *> QGraphicsViewPrivate::findItems(class QRegion const &, bool *, class QTransform const &) const + ?fixup@QIntValidator@@UBEXAAVQString@@@Z @ 12659 NONAME ABSENT ; void QIntValidator::fixup(class QString &) const + ?freeStyleOptionsArray@QGraphicsViewPrivate@@QAEXPAVQStyleOptionGraphicsItem@@@Z @ 12660 NONAME ABSENT ; void QGraphicsViewPrivate::freeStyleOptionsArray(class QStyleOptionGraphicsItem *) + ?getPixmapCursor@QApplicationPrivate@@QAE?AVQPixmap@@W4CursorShape@Qt@@@Z @ 12661 NONAME ABSENT ; class QPixmap QApplicationPrivate::getPixmapCursor(enum Qt::CursorShape) + ?getSubRange@QBezier@@QBE?AV1@MM@Z @ 12662 NONAME ABSENT ; class QBezier QBezier::getSubRange(float, float) const + ?hasSelectedText@QLabel@@QBE_NXZ @ 12663 NONAME ABSENT ; bool QLabel::hasSelectedText(void) const + ?horizontalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12664 NONAME ABSENT ; long long QGraphicsViewPrivate::horizontalScroll(void) const + ?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12665 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *) + ?init@QAbstractScrollAreaPrivate@@QAEXXZ @ 12666 NONAME ABSENT ; void QAbstractScrollAreaPrivate::init(void) + ?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12667 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &) + ?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12668 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &) + ?isReadable@QZipReader@@QBE_NXZ @ 12669 NONAME ABSENT ; bool QZipReader::isReadable(void) const + ?isValidColor@QColor@@SA_NABVQString@@@Z @ 12670 NONAME ABSENT ; bool QColor::isValidColor(class QString const &) + ?layoutChildren@QAbstractScrollAreaPrivate@@QAEXXZ @ 12671 NONAME ABSENT ; void QAbstractScrollAreaPrivate::layoutChildren(void) + ?mapBy@QBezier@@QBE?AV1@ABVQTransform@@@Z @ 12672 NONAME ABSENT ; class QBezier QBezier::mapBy(class QTransform const &) const + ?mapRectFromScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12673 NONAME ABSENT ; class QRectF QGraphicsViewPrivate::mapRectFromScene(class QRectF const &) const + ?mapRectToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABVQRect@@@Z @ 12674 NONAME ABSENT ; class QRectF QGraphicsViewPrivate::mapRectToScene(class QRect const &) const + ?mapToScene@QGraphicsViewPrivate@@QBE?AVQPointF@@ABV2@@Z @ 12675 NONAME ABSENT ; class QPointF QGraphicsViewPrivate::mapToScene(class QPointF const &) const + ?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12676 NONAME ABSENT ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const + ?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12677 NONAME ABSENT ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const + ?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12678 NONAME ABSENT ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const + ?maximumSize@QStaticText@@QBE?AVQSizeF@@XZ @ 12679 NONAME ABSENT ; class QSizeF QStaticText::maximumSize(void) const + ?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12680 NONAME ABSENT ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *) + ?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12681 NONAME ABSENT ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const + ?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12682 NONAME ABSENT ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *) + ?populateSceneDragDropEvent@QGraphicsViewPrivate@@QAEXPAVQGraphicsSceneDragDropEvent@@PAVQDropEvent@@@Z @ 12683 NONAME ABSENT ; void QGraphicsViewPrivate::populateSceneDragDropEvent(class QGraphicsSceneDragDropEvent *, class QDropEvent *) + ?positionInBlock@QTextCursor@@QBEHXZ @ 12684 NONAME ABSENT ; int QTextCursor::positionInBlock(void) const + ?prepare@QStaticText@@QAEXABVQTransform@@ABVQFont@@@Z @ 12685 NONAME ABSENT ; void QStaticText::prepare(class QTransform const &, class QFont const &) + ?processPendingUpdates@QGraphicsViewPrivate@@QAEXXZ @ 12686 NONAME ABSENT ; void QGraphicsViewPrivate::processPendingUpdates(void) + ?q_func@QAbstractScrollAreaPrivate@@AAEPAVQAbstractScrollArea@@XZ @ 12687 NONAME ABSENT ; class QAbstractScrollArea * QAbstractScrollAreaPrivate::q_func(void) + ?q_func@QAbstractScrollAreaPrivate@@ABEPBVQAbstractScrollArea@@XZ @ 12688 NONAME ABSENT ; class QAbstractScrollArea const * QAbstractScrollAreaPrivate::q_func(void) const + ?q_func@QGraphicsViewPrivate@@AAEPAVQGraphicsView@@XZ @ 12689 NONAME ABSENT ; class QGraphicsView * QGraphicsViewPrivate::q_func(void) + ?q_func@QGraphicsViewPrivate@@ABEPBVQGraphicsView@@XZ @ 12690 NONAME ABSENT ; class QGraphicsView const * QGraphicsViewPrivate::q_func(void) const + ?qt_draw_glyphs@@YAXPAVQPainter@@PBIPBVQPointF@@H@Z @ 12691 NONAME ABSENT ; void qt_draw_glyphs(class QPainter *, unsigned int const *, class QPointF const *, int) + ?recalculateContentSize@QGraphicsViewPrivate@@QAEXXZ @ 12692 NONAME ABSENT ; void QGraphicsViewPrivate::recalculateContentSize(void) + ?render@QWidgetPrivate@@QAEXPAVQPaintDevice@@ABVQPoint@@ABVQRegion@@V?$QFlags@W4RenderFlag@QWidget@@@@_N@Z @ 12693 NONAME ABSENT ; void QWidgetPrivate::render(class QPaintDevice *, class QPoint const &, class QRegion const &, class QFlags<enum QWidget::RenderFlag>, bool) + ?replaceScrollBar@QAbstractScrollAreaPrivate@@QAEXPAVQScrollBar@@W4Orientation@Qt@@@Z @ 12694 NONAME ABSENT ; void QAbstractScrollAreaPrivate::replaceScrollBar(class QScrollBar *, enum Qt::Orientation) + ?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12695 NONAME ABSENT ; void QGraphicsViewPrivate::replayLastMouseEvent(void) + ?rubberBandRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQWidget@@ABVQRect@@@Z @ 12696 NONAME ABSENT ; class QRegion QGraphicsViewPrivate::rubberBandRegion(class QWidget const *, class QRect const &) const + ?scrollBarPolicyChanged@QAbstractScrollAreaPrivate@@UAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 12697 NONAME ABSENT ; void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(enum Qt::Orientation, enum Qt::ScrollBarPolicy) + ?selectedText@QLabel@@QBE?AVQString@@XZ @ 12698 NONAME ABSENT ; class QString QLabel::selectedText(void) const + ?selectionStart@QLabel@@QBEHXZ @ 12699 NONAME ABSENT ; int QLabel::selectionStart(void) const + ?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12700 NONAME ABSENT ; void QGraphicsWidget::setAutoFillBackground(bool) + ?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12701 NONAME ABSENT ; bool QColor::setColorFromString(class QString const &) + ?setMaximumSize@QStaticText@@QAEXABVQSizeF@@@Z @ 12702 NONAME ABSENT ; void QStaticText::setMaximumSize(class QSizeF const &) + ?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12703 NONAME ABSENT ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint) + ?setSelection@QLabel@@QAEXHH@Z @ 12704 NONAME ABSENT ; void QLabel::setSelection(int, int) + ?setText@QStaticText@@QAEXABVQString@@@Z @ 12705 NONAME ABSENT ; void QStaticText::setText(class QString const &) + ?setTextFormat@QStaticText@@QAEXW4TextFormat@Qt@@@Z @ 12706 NONAME ABSENT ; void QStaticText::setTextFormat(enum Qt::TextFormat) + ?setUserData@QStaticTextItem@@QAEXPAVQStaticTextUserData@@@Z @ 12707 NONAME ABSENT ; void QStaticTextItem::setUserData(class QStaticTextUserData *) + ?size@QStaticText@@QBE?AVQSizeF@@XZ @ 12708 NONAME ABSENT ; class QSizeF QStaticText::size(void) const + ?status@QZipReader@@QBE?AW4Status@1@XZ @ 12709 NONAME ABSENT ; enum QZipReader::Status QZipReader::status(void) const + ?storeDragDropEvent@QGraphicsViewPrivate@@QAEXPBVQGraphicsSceneDragDropEvent@@@Z @ 12710 NONAME ABSENT ; void QGraphicsViewPrivate::storeDragDropEvent(class QGraphicsSceneDragDropEvent const *) + ?storeMouseEvent@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12711 NONAME ABSENT ; void QGraphicsViewPrivate::storeMouseEvent(class QMouseEvent *) + ?text@QStaticText@@QBE?AVQString@@XZ @ 12712 NONAME ABSENT ; class QString QStaticText::text(void) const + ?textFormat@QStaticText@@QBE?AW4TextFormat@Qt@@XZ @ 12713 NONAME ABSENT ; enum Qt::TextFormat QStaticText::textFormat(void) const + ?translateTouchEvent@QGraphicsViewPrivate@@SAXPAV1@PAVQTouchEvent@@@Z @ 12714 NONAME ABSENT ; void QGraphicsViewPrivate::translateTouchEvent(class QGraphicsViewPrivate *, class QTouchEvent *) + ?updateAll@QGraphicsViewPrivate@@QAEXXZ @ 12715 NONAME ABSENT ; void QGraphicsViewPrivate::updateAll(void) + ?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12716 NONAME ABSENT ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void) + ?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12717 NONAME ABSENT ; void QGraphicsViewPrivate::updateLastCenterPoint(void) + ?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12718 NONAME ABSENT ; bool QGraphicsViewPrivate::updateRect(class QRect const &) + ?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRegion@@@Z @ 12719 NONAME ABSENT ; bool QGraphicsViewPrivate::updateRegion(class QRegion const &) + ?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12720 NONAME ABSENT ; void QGraphicsViewPrivate::updateScroll(void) + ?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12721 NONAME ABSENT ; long long QGraphicsViewPrivate::verticalScroll(void) const + ?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12722 NONAME ABSENT ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *) + ?visibilityChanged@QToolBar@@IAEX_N@Z @ 12723 NONAME ABSENT ; void QToolBar::visibilityChanged(bool) + ??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12724 NONAME ABSENT ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &) + ??0QStaticText@@QAE@ABVQString@@@Z @ 12725 NONAME ABSENT ; QStaticText::QStaticText(class QString const &) + ?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ABSENT ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *) + ?bitPlaneCount@QImage@@QBEHXZ @ 12727 NONAME ABSENT ; int QImage::bitPlaneCount(void) const + ?childrenChanged@QGraphicsObject@@IAEXXZ @ 12728 NONAME ABSENT ; void QGraphicsObject::childrenChanged(void) + ?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12729 NONAME ABSENT ; class QDeclarativeListProperty<class QGraphicsObject> QGraphicsItemPrivate::childrenList(void) + ?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12730 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool) + ?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12731 NONAME ABSENT ; class QString QPaintBuffer::commandDescription(int) const + ?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12732 NONAME ABSENT ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float) + ?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12733 NONAME ABSENT ; class QIODevice * QZipReader::device(void) const + ?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12734 NONAME ABSENT ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>) + ?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12735 NONAME ABSENT ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>) + ?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12736 NONAME ABSENT ; int QPaintBuffer::frameEndIndex(int) const + ?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12737 NONAME ABSENT ; int QPaintBuffer::frameStartIndex(int) const + ?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12738 NONAME ABSENT ; void QGraphicsWidget::geometryChanged(void) + ?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12739 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *) + ?height@QGraphicsItemPrivate@@UBEMXZ @ 12740 NONAME ABSENT ; float QGraphicsItemPrivate::height(void) const + ?heightChanged@QGraphicsObject@@IAEXXZ @ 12741 NONAME ABSENT ; void QGraphicsObject::heightChanged(void) + ?horizontalAdvance@QTextLine@@QBEMXZ @ 12742 NONAME ABSENT ; float QTextLine::horizontalAdvance(void) const + ?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12743 NONAME ABSENT ; bool QZipReader::FileInfo::isValid(void) const + ?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12744 NONAME ABSENT ; void QGraphicsWidget::layoutChanged(void) + ?pageAdded@QWizard@@IAEXH@Z @ 12745 NONAME ABSENT ; void QWizard::pageAdded(int) + ?pageRemoved@QWizard@@IAEXH@Z @ 12746 NONAME ABSENT ; void QWizard::pageRemoved(int) + ?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12747 NONAME ABSENT ; void QLineControl::paste(enum QClipboard::Mode) + ?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12748 NONAME ABSENT ; void QTextControl::paste(enum QClipboard::Mode) + ?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12749 NONAME ABSENT ; class QString QLineEdit::placeholderText(void) const + ?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12750 NONAME ABSENT ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *) + ?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12751 NONAME ABSENT ; int QPaintBuffer::processCommands(class QPainter *, int, int) const + ?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12752 NONAME ABSENT ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int) + ?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12753 NONAME ABSENT ; void QGraphicsItemPrivate::resetHeight(void) + ?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12754 NONAME ABSENT ; void QGraphicsItemPrivate::resetWidth(void) + ?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12755 NONAME ABSENT ; void QSplitterHandle::resizeEvent(class QResizeEvent *) + ?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12756 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool) + ?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12757 NONAME ABSENT ; void QGraphicsItemPrivate::setHeight(float) + ?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12758 NONAME ABSENT ; void QLineEdit::setPlaceholderText(class QString const &) + ?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12759 NONAME ABSENT ; void QWizard::setSideWidget(class QWidget *) + ?setTextWidth@QStaticText@@QAEXM@Z @ 12760 NONAME ABSENT ; void QStaticText::setTextWidth(float) + ?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12761 NONAME ABSENT ; void QGraphicsItemPrivate::setWidth(float) + ?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12762 NONAME ABSENT ; class QWidget * QWizard::sideWidget(void) const + ?textWidth@QStaticText@@QBEMXZ @ 12763 NONAME ABSENT ; float QStaticText::textWidth(void) const + ?updateDisplayText@QLineControl@@AAEX_N@Z @ 12764 NONAME ; void QLineControl::updateDisplayText(bool) + ?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12765 NONAME ABSENT ; void QGraphicsItem::updateMicroFocus(void) + ?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12766 NONAME ABSENT ; void QGraphicsObject::updateMicroFocus(void) + ?width@QGraphicsItemPrivate@@UBEMXZ @ 12767 NONAME ABSENT ; float QGraphicsItemPrivate::width(void) const + ?widthChanged@QGraphicsObject@@IAEXXZ @ 12768 NONAME ABSENT ; void QGraphicsObject::widthChanged(void) + ?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12769 NONAME ABSENT ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *) + ?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12770 NONAME ABSENT ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty<class QGraphicsObject> *, int) + ?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12771 NONAME ABSENT ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty<class QGraphicsObject> *) + ?display@QEglContext@@QAEHXZ @ 12772 NONAME ABSENT ; int QEglContext::display(void) + ?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12773 NONAME ABSENT ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags<enum QEgl::ConfigOption>) + ?configAttrib@QEglContext@@QBEHH@Z @ 12774 NONAME ABSENT ; int QEglContext::configAttrib(int) const + ?error@QEgl@@YAHXZ @ 12775 NONAME ABSENT ; int QEgl::error(void) + ?errorString@QEgl@@YA?AVQString@@XZ @ 12776 NONAME ABSENT ; class QString QEgl::errorString(void) + ?configProperties@QEglContext@@QBE?AVQEglProperties@@XZ @ 12777 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(void) const + ?extensions@QEgl@@YA?AVQString@@XZ @ 12778 NONAME ABSENT ; class QString QEgl::extensions(void) + ?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12779 NONAME ABSENT ; void * QEgl::nativePixmap(class QPixmap *) + ?display@QEgl@@YAHXZ @ 12780 NONAME ABSENT ; int QEgl::display(void) + ?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12781 NONAME ABSENT ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *) + ?hasExtension@QEgl@@YA_NPBD@Z @ 12782 NONAME ABSENT ; bool QEgl::hasExtension(char const *) + ?destroyContext@QEglContext@@QAEXXZ @ 12783 NONAME ; void QEglContext::destroyContext(void) + ?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12784 NONAME ABSENT ; void * QEgl::nativeWindow(class QWidget *) + ?errorString@QEgl@@YA?AVQString@@H@Z @ 12785 NONAME ABSENT ; class QString QEgl::errorString(int) + ?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12786 NONAME ABSENT ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch) + ?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12787 NONAME ABSENT ; int QEgl::eglDestroyImageKHR(int, int) + ?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12788 NONAME ABSENT ; bool QItemSelectionRange::isEmpty(void) const + ?clearError@QEgl@@YAXXZ @ 12789 NONAME ABSENT ; void QEgl::clearError(void) + ?nativeDisplay@QEgl@@YAHXZ @ 12790 NONAME ABSENT ; int QEgl::nativeDisplay(void) + ?dumpAllConfigs@QEgl@@YAXXZ @ 12791 NONAME ABSENT ; void QEgl::dumpAllConfigs(void) + ?setDeviceType@QEglProperties@@QAEXH@Z @ 12792 NONAME ABSENT ; void QEglProperties::setDeviceType(int) + ?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12793 NONAME ABSENT ; int QTextureGlyphCache::glyphPadding(void) const + ?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12794 NONAME ABSENT ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *) + ?display@QEglContext@@SAHXZ @ 12795 NONAME ; int QEglContext::display(void) + ?nativeDisplay@QEglContext@@CAHXZ @ 12796 NONAME ; int QEglContext::nativeDisplay(void) + ?dpy@QEglContext@@0HA @ 12797 NONAME ; int QEglContext::dpy diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index ac70e70..93fce62 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -11741,47 +11741,47 @@ EXPORTS _ZN11QVectorPathD2Ev @ 11740 NONAME _ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME _ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME - _ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT + _ZN11QEglContext10extensionsEv @ 11743 NONAME _ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT - _ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT - _ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT - _ZN11QEglContext11doneCurrentEv @ 11747 NONAME ABSENT - _ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT - _ZN11QEglContext11makeCurrentEi @ 11749 NONAME ABSENT + _ZN11QEglContext10waitClientEv @ 11745 NONAME + _ZN11QEglContext10waitNativeEv @ 11746 NONAME + _ZN11QEglContext11doneCurrentEv @ 11747 NONAME + _ZN11QEglContext11errorStringEi @ 11748 NONAME + _ZN11QEglContext11makeCurrentEi @ 11749 NONAME _ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT - _ZN11QEglContext11swapBuffersEi @ 11751 NONAME ABSENT - _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME ABSENT - _ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT - _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME ABSENT - _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME ABSENT - _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME ABSENT + _ZN11QEglContext11swapBuffersEi @ 11751 NONAME + _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME + _ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME + _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME + _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME + _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME _ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT - _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME ABSENT - _ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT - _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME ABSENT - _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME ABSENT + _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME + _ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME + _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME + _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME _ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT - _ZN11QEglContextC1Ev @ 11763 NONAME ABSENT - _ZN11QEglContextC2Ev @ 11764 NONAME ABSENT - _ZN11QEglContextD1Ev @ 11765 NONAME ABSENT - _ZN11QEglContextD2Ev @ 11766 NONAME ABSENT - _ZN14QEglProperties11removeValueEi @ 11767 NONAME ABSENT - _ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT - _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME ABSENT - _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME ABSENT - _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME ABSENT - _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME ABSENT - _ZN14QEglProperties8setValueEii @ 11773 NONAME ABSENT - _ZN14QEglPropertiesC1Ei @ 11774 NONAME ABSENT - _ZN14QEglPropertiesC1Ev @ 11775 NONAME ABSENT - _ZN14QEglPropertiesC2Ei @ 11776 NONAME ABSENT - _ZN14QEglPropertiesC2Ev @ 11777 NONAME ABSENT - _ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT - _ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT - _ZNK11QEglContext7isValidEv @ 11780 NONAME ABSENT - _ZNK11QEglContext9isCurrentEv @ 11781 NONAME ABSENT - _ZNK14QEglProperties5valueEi @ 11782 NONAME ABSENT - _ZNK14QEglProperties8toStringEv @ 11783 NONAME ABSENT + _ZN11QEglContextC1Ev @ 11763 NONAME + _ZN11QEglContextC2Ev @ 11764 NONAME + _ZN11QEglContextD1Ev @ 11765 NONAME + _ZN11QEglContextD2Ev @ 11766 NONAME + _ZN14QEglProperties11removeValueEi @ 11767 NONAME + _ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME + _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME + _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME + _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME + _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME + _ZN14QEglProperties8setValueEii @ 11773 NONAME + _ZN14QEglPropertiesC1Ei @ 11774 NONAME + _ZN14QEglPropertiesC1Ev @ 11775 NONAME + _ZN14QEglPropertiesC2Ei @ 11776 NONAME + _ZN14QEglPropertiesC2Ev @ 11777 NONAME + _ZNK11QEglContext12configAttribEiPi @ 11778 NONAME + _ZNK11QEglContext16configPropertiesEi @ 11779 NONAME + _ZNK11QEglContext7isValidEv @ 11780 NONAME + _ZNK11QEglContext9isCurrentEv @ 11781 NONAME + _ZNK14QEglProperties5valueEi @ 11782 NONAME + _ZNK14QEglProperties8toStringEv @ 11783 NONAME _ZNK11QFontEngine10glyphCacheEPvN21QFontEngineGlyphCache4TypeERK10QTransform @ 11784 NONAME _ZNK20QGraphicsItemPrivate21effectiveBoundingRectERK6QRectF @ 11785 NONAME _Z12qt_blurImageP8QPainterR6QImagefbbi @ 11786 NONAME @@ -11806,16 +11806,195 @@ EXPORTS _ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME _ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME _ZN13QFontDatabase25removeAllApplicationFontsEv @ 11807 NONAME - _ZN11QEglContext13nativeDisplayEv @ 11808 NONAME ABSENT - _ZN11QEglContext14destroyContextEv @ 11809 NONAME ABSENT - _ZN11QEglContext3dpyE @ 11810 NONAME DATA 4 ABSENT - _ZN11QEglContext7displayEv @ 11811 NONAME ABSENT - _ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11812 NONAME - _ZN12QLineControl17updateDisplayTextEb @ 11813 NONAME - _ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11814 NONAME - _ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11815 NONAME - _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11816 NONAME - _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11817 NONAME - _ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11818 NONAME - _ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11819 NONAME + _ZN10QZipReader5closeEv @ 11808 NONAME ABSENT + _ZN10QZipReader8FileInfoC1ERKS0_ @ 11809 NONAME ABSENT + _ZN10QZipReader8FileInfoC1Ev @ 11810 NONAME ABSENT + _ZN10QZipReader8FileInfoC2ERKS0_ @ 11811 NONAME ABSENT + _ZN10QZipReader8FileInfoC2Ev @ 11812 NONAME ABSENT + _ZN10QZipReader8FileInfoD1Ev @ 11813 NONAME ABSENT + _ZN10QZipReader8FileInfoD2Ev @ 11814 NONAME ABSENT + _ZN10QZipReader8FileInfoaSERKS0_ @ 11815 NONAME ABSENT + _ZN10QZipReaderC1EP9QIODevice @ 11816 NONAME ABSENT + _ZN10QZipReaderC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11817 NONAME ABSENT + _ZN10QZipReaderC2EP9QIODevice @ 11818 NONAME ABSENT + _ZN10QZipReaderC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11819 NONAME ABSENT + _ZN10QZipReaderD1Ev @ 11820 NONAME ABSENT + _ZN10QZipReaderD2Ev @ 11821 NONAME ABSENT + _ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11822 NONAME ABSENT + _ZN11QStaticText14setMaximumSizeERK6QSizeF @ 11823 NONAME ABSENT + _ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11824 NONAME ABSENT + _ZN11QStaticText6detachEv @ 11825 NONAME ABSENT + _ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11826 NONAME ABSENT + _ZN11QStaticText7setTextERK7QString @ 11827 NONAME ABSENT + _ZN11QStaticTextC1ERK7QString @ 11828 NONAME ABSENT + _ZN11QStaticTextC1ERKS_ @ 11829 NONAME ABSENT + _ZN11QStaticTextC1Ev @ 11830 NONAME ABSENT + _ZN11QStaticTextC2ERK7QString @ 11831 NONAME ABSENT + _ZN11QStaticTextC2ERKS_ @ 11832 NONAME ABSENT + _ZN11QStaticTextC2Ev @ 11833 NONAME ABSENT + _ZN11QStaticTextD1Ev @ 11834 NONAME ABSENT + _ZN11QStaticTextD2Ev @ 11835 NONAME ABSENT + _ZN11QStaticTextaSERKS_ @ 11836 NONAME ABSENT + _ZN12QKeySequence6assignERK7QStringNS_14SequenceFormatE @ 11837 NONAME ABSENT + _ZN12QKeySequenceC1ERK7QStringNS_14SequenceFormatE @ 11838 NONAME ABSENT + _ZN12QKeySequenceC2ERK7QStringNS_14SequenceFormatE @ 11839 NONAME ABSENT + _ZN13QTextDocument19clearUndoRedoStacksENS_6StacksE @ 11840 NONAME ABSENT + _ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter8FragmentEiRK7QPixmap6QFlagsINS0_12FragmentHintEE @ 11841 NONAME ABSENT + _ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11842 NONAME + _ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11843 NONAME + _ZN14QWidgetPrivate6renderEP12QPaintDeviceRK6QPointRK7QRegion6QFlagsIN7QWidget10RenderFlagEEb @ 11844 NONAME ABSENT + _ZN15QGraphicsWidget21setAutoFillBackgroundEb @ 11845 NONAME ABSENT + _ZN16QFileSystemModel15directoryLoadedERK7QString @ 11846 NONAME ABSENT + _ZN18QTextureGlyphCache8populateEP11QFontEngineiPKjPK11QFixedPoint @ 11847 NONAME ABSENT + _ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11848 NONAME ABSENT + _ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11849 NONAME ABSENT + _ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11850 NONAME ABSENT + _ZN20QGraphicsViewPrivate12updateRegionERK7QRegion @ 11851 NONAME ABSENT + _ZN20QGraphicsViewPrivate12updateScrollEv @ 11852 NONAME ABSENT + _ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11853 NONAME ABSENT + _ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11854 NONAME ABSENT + _ZN20QGraphicsViewPrivate19translateTouchEventEPS_P11QTouchEvent @ 11855 NONAME ABSENT + _ZN20QGraphicsViewPrivate20_q_setViewportCursorERK7QCursor @ 11856 NONAME ABSENT + _ZN20QGraphicsViewPrivate20replayLastMouseEventEv @ 11857 NONAME ABSENT + _ZN20QGraphicsViewPrivate21freeStyleOptionsArrayEP24QStyleOptionGraphicsItem @ 11858 NONAME ABSENT + _ZN20QGraphicsViewPrivate21mouseMoveEventHandlerEP11QMouseEvent @ 11859 NONAME ABSENT + _ZN20QGraphicsViewPrivate21processPendingUpdatesEv @ 11860 NONAME ABSENT + _ZN20QGraphicsViewPrivate21updateLastCenterPointEv @ 11861 NONAME ABSENT + _ZN20QGraphicsViewPrivate22_q_unsetViewportCursorEv @ 11862 NONAME ABSENT + _ZN20QGraphicsViewPrivate22allocStyleOptionsArrayEi @ 11863 NONAME ABSENT + _ZN20QGraphicsViewPrivate22recalculateContentSizeEv @ 11864 NONAME ABSENT + _ZN20QGraphicsViewPrivate26populateSceneDragDropEventEP27QGraphicsSceneDragDropEventP10QDropEvent @ 11865 NONAME ABSENT + _ZN20QGraphicsViewPrivate28updateInputMethodSensitivityEv @ 11866 NONAME ABSENT + _ZN20QGraphicsViewPrivateC1Ev @ 11867 NONAME ABSENT + _ZN20QGraphicsViewPrivateC2Ev @ 11868 NONAME ABSENT + _ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11869 NONAME + _ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11870 NONAME + _ZN26QAbstractScrollAreaPrivate14layoutChildrenEv @ 11871 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE @ 11872 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv @ 11873 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivate4initEv @ 11874 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivate9_q_hslideEi @ 11875 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivate9_q_vslideEi @ 11876 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivateC1Ev @ 11877 NONAME ABSENT + _ZN26QAbstractScrollAreaPrivateC2Ev @ 11878 NONAME ABSENT + _ZN6QColor12isValidColorERK7QString @ 11879 NONAME ABSENT + _ZN6QColor18setColorFromStringERK7QString @ 11880 NONAME ABSENT + _ZN6QLabel12setSelectionEii @ 11881 NONAME ABSENT + _ZN7QPixmap16convertFromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 11882 NONAME ABSENT + _ZN8QPainter14drawStaticTextERK7QPointFRK11QStaticText @ 11883 NONAME ABSENT + _ZN8QPainter19drawPixmapFragmentsEPKNS_8FragmentEiRK7QPixmap6QFlagsINS_12FragmentHintEE @ 11884 NONAME ABSENT + _ZN8QPainter8Fragment6createERK7QPointFRK6QRectFffff @ 11885 NONAME ABSENT + _ZN8QToolBar17visibilityChangedEb @ 11886 NONAME ABSENT + _ZNK10QZipReader10extractAllERK7QString @ 11887 NONAME ABSENT + _ZNK10QZipReader10isReadableEv @ 11888 NONAME ABSENT + _ZNK10QZipReader11entryInfoAtEi @ 11889 NONAME ABSENT + _ZNK10QZipReader12fileInfoListEv @ 11890 NONAME ABSENT + _ZNK10QZipReader5countEv @ 11891 NONAME ABSENT + _ZNK10QZipReader6existsEv @ 11892 NONAME ABSENT + _ZNK10QZipReader6statusEv @ 11893 NONAME ABSENT + _ZNK10QZipReader8fileDataERK7QString @ 11894 NONAME ABSENT + _ZNK11QStaticText10textFormatEv @ 11895 NONAME ABSENT + _ZNK11QStaticText11maximumSizeEv @ 11896 NONAME ABSENT + _ZNK11QStaticText15performanceHintEv @ 11897 NONAME ABSENT + _ZNK11QStaticText4sizeEv @ 11898 NONAME ABSENT + _ZNK11QStaticText4textEv @ 11899 NONAME ABSENT + _ZNK11QStaticTexteqERKS_ @ 11900 NONAME ABSENT + _ZNK11QStaticTextneERKS_ @ 11901 NONAME ABSENT + _ZNK11QTextCursor15positionInBlockEv @ 11902 NONAME ABSENT + _ZNK13QIntValidator5fixupER7QString @ 11903 NONAME ABSENT + _ZNK14QPlainTextEdit8anchorAtERK6QPoint @ 11904 NONAME ABSENT + _ZNK15QGraphicsWidget18autoFillBackgroundEv @ 11905 NONAME ABSENT + _ZNK20QGraphicsViewPrivate10mapToSceneERK6QRectF @ 11906 NONAME ABSENT + _ZNK20QGraphicsViewPrivate10mapToSceneERK7QPointF @ 11907 NONAME ABSENT + _ZNK20QGraphicsViewPrivate13mapToViewRectEPK13QGraphicsItemRK6QRectF @ 11908 NONAME ABSENT + _ZNK20QGraphicsViewPrivate14mapRectToSceneERK5QRect @ 11909 NONAME ABSENT + _ZNK20QGraphicsViewPrivate14verticalScrollEv @ 11910 NONAME ABSENT + _ZNK20QGraphicsViewPrivate15mapToViewRegionEPK13QGraphicsItemRK6QRectF @ 11911 NONAME ABSENT + _ZNK20QGraphicsViewPrivate16horizontalScrollEv @ 11912 NONAME ABSENT + _ZNK20QGraphicsViewPrivate16mapRectFromSceneERK6QRectF @ 11913 NONAME ABSENT + _ZNK20QGraphicsViewPrivate16rubberBandRegionEPK7QWidgetRK5QRect @ 11914 NONAME ABSENT + _ZNK20QGraphicsViewPrivate9findItemsERK7QRegionPbRK10QTransform @ 11915 NONAME ABSENT + _ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv @ 11916 NONAME ABSENT + _ZNK6QImage13constScanLineEi @ 11917 NONAME ABSENT + _ZNK6QImage9constBitsEv @ 11918 NONAME ABSENT + _ZNK6QLabel12selectedTextEv @ 11919 NONAME ABSENT + _ZNK6QLabel14selectionStartEv @ 11920 NONAME ABSENT + _ZNK6QLabel15hasSelectedTextEv @ 11921 NONAME ABSENT + _ZNK7QBezier11getSubRangeEff @ 11922 NONAME ABSENT + _ZNK7QBezier5mapByERK10QTransform @ 11923 NONAME ABSENT + _ZTI20QGraphicsViewPrivate @ 11924 NONAME ABSENT + _ZTI26QAbstractScrollAreaPrivate @ 11925 NONAME ABSENT + _ZTV20QGraphicsViewPrivate @ 11926 NONAME ABSENT + _ZTV26QAbstractScrollAreaPrivate @ 11927 NONAME ABSENT + _Z14qt_draw_glyphsP8QPainterPKjPK7QPointFi @ 11928 NONAME ABSENT + _ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11929 NONAME + _ZN12QLineControl17updateDisplayTextEb @ 11930 NONAME + _ZN12QLineControl5pasteEN10QClipboard4ModeE @ 11931 NONAME ABSENT + _ZN12QTextControl5pasteEN10QClipboard4ModeE @ 11932 NONAME ABSENT + _ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 11933 NONAME ABSENT + _ZN15QGraphicsObject12widthChangedEv @ 11934 NONAME ABSENT + _ZN15QGraphicsObject13heightChangedEv @ 11935 NONAME ABSENT + _ZN15QGraphicsObject15childrenChangedEv @ 11936 NONAME ABSENT + _ZN15QGraphicsWidget15geometryChangedEv @ 11937 NONAME ABSENT + _ZN15QSplitterHandle11resizeEventEP12QResizeEvent @ 11938 NONAME ABSENT + _ZN20QGraphicsItemPrivate10resetWidthEv @ 11939 NONAME ABSENT + _ZN20QGraphicsItemPrivate11resetHeightEv @ 11940 NONAME ABSENT + _ZN20QGraphicsItemPrivate12childrenListEv @ 11941 NONAME ABSENT + _ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11942 NONAME + _ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11943 NONAME + _ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11944 NONAME ABSENT + _ZN20QGraphicsItemPrivate6appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11945 NONAME ABSENT + _ZN20QGraphicsItemPrivate8setWidthEf @ 11946 NONAME ABSENT + _ZN20QGraphicsItemPrivate9setHeightEf @ 11947 NONAME ABSENT + _ZN7QWizard11pageRemovedEi @ 11948 NONAME ABSENT + _ZN7QWizard13setSideWidgetEP7QWidget @ 11949 NONAME ABSENT + _ZN7QWizard9pageAddedEi @ 11950 NONAME ABSENT + _ZN8QPainter14PixmapFragment6createERK7QPointFRK6QRectFffff @ 11951 NONAME ABSENT + _ZN8QPainter19drawPixmapFragmentsEPKNS_14PixmapFragmentEiRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 11952 NONAME ABSENT + _ZN9QLineEdit18setPlaceholderTextERK7QString @ 11953 NONAME ABSENT + _ZNK10QZipReader6deviceEv @ 11954 NONAME ABSENT + _ZNK10QZipReader8FileInfo7isValidEv @ 11955 NONAME ABSENT + _ZNK20QGraphicsItemPrivate5widthEv @ 11956 NONAME ABSENT + _ZNK20QGraphicsItemPrivate6heightEv @ 11957 NONAME ABSENT + _ZNK6QImage13bitPlaneCountEv @ 11958 NONAME ABSENT + _ZNK7QWizard10sideWidgetEv @ 11959 NONAME ABSENT + _ZNK9QLineEdit15placeholderTextEv @ 11960 NONAME ABSENT + _ZNK9QTextLine17horizontalAdvanceEv @ 11961 NONAME ABSENT + _ZN11QStaticText12setTextWidthEf @ 11962 NONAME ABSENT + _ZN13QGraphicsItem16updateMicroFocusEv @ 11963 NONAME ABSENT + _ZN15QGraphicsObject16updateMicroFocusEv @ 11964 NONAME ABSENT + _ZN15QGraphicsWidget13layoutChangedEv @ 11965 NONAME ABSENT + _ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11966 NONAME ABSENT + _ZNK11QStaticText9textWidthEv @ 11967 NONAME ABSENT + _ZNK12QPaintBuffer13frameEndIndexEi @ 11968 NONAME ABSENT + _ZNK12QPaintBuffer15frameStartIndexEi @ 11969 NONAME ABSENT + _ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11970 NONAME ABSENT + _ZNK12QPaintBuffer18commandDescriptionEi @ 11971 NONAME ABSENT + _ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME ABSENT + _ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME ABSENT + _ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME ABSENT + _ZN11QEglContext14destroyContextEv @ 11975 NONAME + _ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME ABSENT + _ZN4QEgl10clearErrorEv @ 11977 NONAME ABSENT + _ZN4QEgl10extensionsEv @ 11978 NONAME ABSENT + _ZN4QEgl11errorStringEi @ 11979 NONAME ABSENT + _ZN4QEgl11errorStringEv @ 11980 NONAME ABSENT + _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME ABSENT + _ZN4QEgl12hasExtensionEPKc @ 11982 NONAME ABSENT + _ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME ABSENT + _ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME ABSENT + _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME ABSENT + _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME ABSENT + _ZN4QEgl13nativeDisplayEv @ 11987 NONAME ABSENT + _ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME ABSENT + _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME ABSENT + _ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME ABSENT + _ZN4QEgl5errorEv @ 11991 NONAME ABSENT + _ZN4QEgl7displayEv @ 11992 NONAME ABSENT + _ZNK11QEglContext12configAttribEi @ 11993 NONAME ABSENT + _ZNK11QEglContext16configPropertiesEv @ 11994 NONAME ABSENT + _ZNK19QItemSelectionRange7isEmptyEv @ 11995 NONAME ABSENT + _ZN11QEglContext13nativeDisplayEv @ 11996 NONAME + _ZN11QEglContext3dpyE @ 11997 NONAME DATA 4 + _ZN11QEglContext7displayEv @ 11998 NONAME diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/qlineedit/qlineedit.pro index f00a2d8..1f862b4 100644 --- a/tests/auto/qlineedit/qlineedit.pro +++ b/tests/auto/qlineedit/qlineedit.pro @@ -1,4 +1,5 @@ load(qttest_p4) +contains(QT_CONFIG,qt3support) QT += qt3support SOURCES += tst_qlineedit.cpp diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index ca84b38..592c1cb 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -273,6 +273,11 @@ private slots: void taskQTBUG_4679_selectToStartEndOfBlock(); void taskQTBUG_7395_readOnlyShortcut(); +#ifdef QT3_SUPPORT + void validateAndSet_data(); + void validateAndSet(); +#endif + protected slots: #ifdef QT3_SUPPORT void lostFocus(); @@ -1488,6 +1493,34 @@ void tst_QLineEdit::lostFocus() { editingFinished(); } + +void tst_QLineEdit::validateAndSet_data() +{ + QTest::addColumn<QString>("newText"); + QTest::addColumn<int>("newPos"); + QTest::addColumn<int>("newMarkAnchor"); + QTest::addColumn<int>("newMarkDrag"); + + QTest::newRow("1") << QString("Hello World") << 3 << 3 << 5; + QTest::newRow("2") << QString("Hello World") << 5 << 3 << 5; +} + +void tst_QLineEdit::validateAndSet() +{ + QFETCH(QString, newText); + QFETCH(int, newPos); + QFETCH(int, newMarkAnchor); + QFETCH(int, newMarkDrag); + + QLineEdit e; + e.validateAndSet(newText, newPos, newMarkAnchor, newMarkDrag); + QCOMPARE(e.text(), newText); + QCOMPARE(e.cursorPosition(), newPos); + QCOMPARE(e.selectedText(), newText.mid(newMarkAnchor, newMarkDrag-newMarkAnchor)); +} + + + #endif void tst_QLineEdit::editingFinished() { |