summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcontext.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-13 15:33:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-13 15:33:42 (GMT)
commit42dda19d82ceea48f19d356cfaf2b26acb763df8 (patch)
treed2c7f2c9de464b1908316b94c07cc8ece831ad00 /src/declarative/qml/qmlcontext.cpp
parent6944a72cd26a5e3611ebd305ec665bc4c0fcee12 (diff)
parentdcb2678f39345b66c5303e74c156654a8d13fe83 (diff)
downloadQt-42dda19d82ceea48f19d356cfaf2b26acb763df8.zip
Qt-42dda19d82ceea48f19d356cfaf2b26acb763df8.tar.gz
Qt-42dda19d82ceea48f19d356cfaf2b26acb763df8.tar.bz2
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits) Add make stub_sis target, and add webkit stub to qt.iby Fix to S60 softkeys when no active Qt window or native widget is shown. doc: Fixed several typos. Doc: remove \preliminary tag from public multimedia classes Fixed the perl download link and description in docs Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again QNAM HTTP: Optimize detectPipeliningSupport() QNAM HTTP: Set channel to IdleState at better place QXmlSchema: fix crash in schema parser We need to export qBadAlloc() on all platforms now really fix the message editor for dark backgrounds Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Update Symbian DEF files Export a function to get dfb-surface from a pixmap Fix the WebKit build Blinking cursors are 2 pixels wide on Mac OS X/Cocoa. Fixed compilation with QT_NO_WHEELEVENT Fixed usage of QGLPixelBuffer with share widgets on other X11 screens. Fixed drawing QPixmaps on QGLWidgets on different X11 screens. Take into account the solaris-cc-64-stlport mkspec ...
Diffstat (limited to 'src/declarative/qml/qmlcontext.cpp')
0 files changed, 0 insertions, 0 deletions