summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Work around crash with RVCT 2.2.Jason Barron2009-06-291-0/+8
| | | | | | RVCT does not like this line of code for some reason, but doesn't seem to mind if it is expanded into multiple lines and the function pointer is initialized with an assignment operator.
* Manually fix bad merges and make sure everything compiles with 4.6.Harald Fernengel2009-06-299-26/+36
|
* Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-25814-22347/+51944
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * Fixed compile of scripttools with MSVC 2003.Rohan McGovern2009-06-131-0/+1
| | | | | | | | | | | | | | Fixes compile error: debugging\qscriptdebuggercommand.cpp(567) : error C2664: 'QScriptDebuggerCommand::setAttribute' : cannot convert parameter 2 from 'const QStringList' to 'const QVariant &' Reason: cannot convert from 'const QStringList' to 'const QVariant' Source or target has incomplete type
| * Fixed compile of Qt/Embedded.Rohan McGovern2009-06-131-2/+2
| | | | | | | | | | | | | | Fixes compile error: kernel/qapplication_qws.cpp: In static member function 'static bool QApplicationPrivate::qws_apply_settings()': kernel/qapplication_qws.cpp:2014: error: no match for 'operator!' in '!QApplicationPrivate::styleOverride' kernel/qapplication_qws.cpp:2014: note: candidates are: operator!(bool) <built-in>
| * Fixed compile of QtGui with MSVC.Rohan McGovern2009-06-121-1/+1
| | | | | | | | | | MSVC requires the same linkage specifiers to be provided at both the declaration and definition.
| * refactor some script debugger internalsKent Hansen2009-06-127-148/+363
| | | | | | | | Make it possible to reuse more code in remote debugger.
| * Improved resetting the DESKTOP_STARTUP_ID envvar on X11Denis Dzyubenko2009-06-122-6/+23
| | | | | | | | | | | | | | | | | | We shouldn't put static variable into the environment since it will crash if someone tries to access environment after Qt has been unloaded. Task-number: related to 217782 Reviewed-by: Bradley T. Hughes
| * Fixed bitmap drawing in GL 2 engine when not using GL pixmap backend.Samuel Rødal2009-06-123-4/+8
| | | | | | | | | | | | | | | | | | QPixmap shouldn't return true in hasAlphaChannel() for bitmaps, instead the paint engine should check whether the pixmap is a bitmap or not. In addition, QBrush::isOpaque() returned true for bitmap brushes, which is wrong according to the documentation. Reviewed-by: Trond
| * CompileJens Bache-Wiig2009-06-123-0/+559
| | | | | | | | | | | | Adding missing files for proxy style after commit 4d0cc0b9600f8530bb0e8712b4bb109d1810c4a7 Reviewed-by: trust me
| * make debugger console's auto-completion asynchronousKent Hansen2009-06-128-103/+196
| | | | | | | | Needed for remote debugging.
| * Integrating QProxyStyleJens Bache-Wiig2009-06-1216-811/+871
| | | | | | | | | | | | | | | | | | | | | | | | This class adds convenient support for proxy styles in Qt. Note that to support proper proxying, styles now call their functions through proxy() so that the proxy regains control over subcomponents. Note that there is a small price to be payed by the extra function call which can at the cost of readability be redirected to the private class member in the future. Task-number: 229556 Reviewed-by: trond
| * QTransform::shear cut-off.Bjørn Erik Nilsen2009-06-121-0/+3
| | | | | | | | | | | | Do nothing if both sh and sv is 0. Reviewed-by: Samuel
| * Speedup QGraphicsItemPrivate::TransformData::computedFullTransformBjørn Erik Nilsen2009-06-122-10/+33
| | | | | | | | | | | | Do as little as possible and avoid premulitplication :) Reviewed-by: Samuel
| * Fixed off-by-one color bug in GL 2 paint engine.Samuel Rødal2009-06-121-5/+5
| | | | | | | | | | Calling premultiplyColor() with a red channel of 255, alpha channel of 255, and opacity 1 would result in a color with red channel of 254.
| * make debugger's tooltip handling asynchronousKent Hansen2009-06-128-56/+110
| | | | | | | | Needed for remote debugging.
| * fix bugs in the completion+tooltip providersKent Hansen2009-06-122-3/+2
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-06-1215-37/+223
| |\
| | * Fixed incorrect rendering of bitmap/pattern brushes in GL 2 engine.Samuel Rødal2009-06-126-9/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pen color should be used when drawPixmap is called with a bitmap, and the brush color should be used for texture patterns that are bitmaps. Task-number: 245802 Reviewed-by: Trond
| | * Made QPixmap autotest pass with -graphicssystem openglSamuel Rødal2009-06-124-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The window surface has been modified to track widget deletion to make sure it doesn't try to access the widget's context data after deletion. QGLPixmapData now also uses GL_RGB instead of GL_RGBA when appropriate, and hasAlphaChannel() has been modified in view of this. A number of other issues have been fixed in QGLPixmapData, and the autotest has been modified to use a more lenient pixmap compare function due to off-by-one pixel errors here and there. Reviewed-by: Trond
| | * QHttp: Class made obsolete, changed module QDoc.Markus Goetz2009-06-121-3/+5
| | | | | | | | | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie
| | * doc: Fixed several qdoc warnings.Martin Smith2009-06-124-10/+79
| | |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-1225-59/+200
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * QGraphicsItem::setOpacity(0.0) does not trigger an update of child itemsLeonardo Sobral Cunha2009-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Forwarding the ignoreOpacity flag to children in QGraphicsItemPrivate::fullUpdateHelper. This is a complementary fix to task 252913, partly fixed in commit 2e3a5ea44... Reviewed-by: bnilsen BT: yes
| | * Copy-paste didn't work for application on non-first screen in multiscreen setup.Denis Dzyubenko2009-06-112-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to subscribe to xfixes selection notify events on all available screens. Also implemented delayed subscription to xfixes events since we don't really need clipboard change notifications unless the application explicitely asked for by (i.e. created a qclipboard object). Task-number: 255609 Reviewed-by: Bradley T. Hughes
| | * Doc fix: add a link to focus() and focusWidget() from QWidget::setFocus ↵Denis Dzyubenko2009-06-111-2/+2
| | | | | | | | | | | | | | | | | | documentation. Reviewed-by: TrustMe
| | * Fixed the pen dash patterns for Mac.Trond Kjernåsen2009-06-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | The predefined dash patterns for Mac have always been off, compared to the ones in the raster engine and the GL engine. Task-number: 255292 Reviewed-by: Kim
| | * fix "make debug" under windowsOswald Buddenhagen2009-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | use relative path for include (like every other subtree does), otherwise $$fromfile() does not find the file, thus the template is unknown and thus the generic "first" target is used instead of "debug", which tries a generic build against non-existing release libs - boom. Reviewed-by: TrustMe
| | * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The border was always drawn before the background, and if there were both a border and background brush set, the background ended up being drawn ontop of the border. Task-number: 255868 Reviewed-by: Samuel
| | * Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETERThomas Hartmann2009-06-102-2/+7
| | | | | | | | | | | | | | | Task-number: 253086 Reviewed-by: Joerg
| | * QSslSocket: Wrong warning message in startServerEncryptionMarkus Goetz2009-06-101-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Fix compile error on TigerRichard Moe Gustavsen2009-06-101-1/+2
| | | | | | | | | | | | | | | | | | the "for-in" syntax is only available on 10.5+ Reviewed-by: MortenS
| | * Make sure QImage::mirrored() doesn't crash if it runs out of memory.Trond Kjernåsen2009-06-101-0/+5
| | | | | | | | | | | | | | | Task-number: 255742 Reviewed-by: Kim
| | * Initialize xform_scale in constructorAnders Bakken2009-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Though this variable always will be initialized in QX11PaintEngine::begin() valgrind complains about conditional jump or move depends on uninitialised value(s). Reviewed-by: Donald <qt-info@nokia.com>
| | * Skip empty parts in KDEDIRSJoão Abecasis2009-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | If KDEDIRS was set to an empty string, this would unintentionally bring /share into the icon search path. Reviewed-by: Olivier Goffart
| | * Make it possible to compile Qt 4.5 SSL support with OpenSSL 1.0.0Bernhard Rosenkraenzer2009-06-095-2/+59
| | | | | | | | | | | | | | | | | | | | | (-beta2, but 1.0.0 final shouldn't be very different) Merge-request: 449 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Make DirectFB compile with 0.9.22Anders Bakken2009-06-092-3/+8
| | | | | | | | | | | | | | | | | | | | | Some options were added for 0.9.23. This change adds some ifdefs so DFB 0.9.22 compiles Reviewed-by: TrustMe
| | * Make the directfb plugin compile against 0.9Anders Bakken2009-06-085-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure to what extent it actually works but atleast it compiles now. - A couple of image formats doesn't exist in 0.9 - IDirectFBSurface::ReleaseSource doesn't exist in 0.9 - IDirectFBWindow::SetBounds doesn't exist in 0.9 Reviewed-by: Donald <qt-info@nokia.com>
| | * Fixed a validation problem in QSvgIOHandler::canRead().Trond Kjernåsen2009-06-081-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSvgIOHandler::canRead() only looked at the 80 first bytes in a SVG file when looking for the <svg> tag. That tag can obviously be found at an arbitrary offset from the start of the file, depending on e.g. comments tags. Task-number: 255419 Reviewed-by: Kim
| | * Change order of functions in QInputDialog::getDouble()Markus Goetz2009-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes issue with decimals in the spinbox used for the double Task-number: 255502 Reviewed-by: mbm
| * | QMenu, QMenuBar: small cleanupThierry Bastian2009-06-127-20/+13
| | | | | | | | | | | | | | | Removed calls to the widget getters because we have the members directly in the private class.
| * | QGraphicsItems are repainted when outside the view's exposed region.Bjørn Erik Nilsen2009-06-121-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we used QRect::isEmpty() on the item's bounding rect intersected with the exposed region's bounding rect as a criteria for whether the item should be drawn or not. This does not work as expected with partial updates, where the boundingRect() of the exposed region easily can cover the entire viewport area. The item should *only* be drawn if its bounding rect intersects with the exposed region (and not the exposed region's bounding rect). Auto-test included.
| * | doc: Fixed several qdoc warnings.Martin Smith2009-06-121-5/+32
| | |
| * | add streaming ops for scriptdebugger object deltasKent Hansen2009-06-122-0/+22
| | | | | | | | | | | | Needed for remote debugging.
| * | Fixed bug where QTransform::type() failed to compute the correct type.Samuel Rødal2009-06-121-5/+10
| | | | | | | | | | | | | | | | | | | | | Since QTransform::type() now uses a switch based on m_dirty, we can't treat m_dirty as a bit mask anymore. Reviewed-by: Ariya
| * | Make repeated calls to QToolTip::hideText() still hide the textmae2009-06-121-8/+13
| | | | | | | | | | | | | | | | | | | | | Previously the 300 msec hide timer was restarted every time hideText() was called. Reviewed-by: Thorbjorn Lindeijer
| * | Fixed clipping bugs in GL 2 paint engine.Samuel Rødal2009-06-121-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Similar to what was done in f86dcade8716a0aee841ba05740887598633de17, we shouldn't multiply by the redirectionMatrix in replayClipOperations() as the clip info matrices already contain the redirectionMatrix. Reviewed-by: bnilsen
| * | doc: Fixed several qdoc warnings.Martin Smith2009-06-124-54/+109
| | |
| * | Allow a maximum of 6 simultaneous HTTP connections to a server.Prasanth Ullattil2009-06-122-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the standard mandates a maximum of 2 connections, most new browsers support atleast 6 connections. So we are also bumping the limit. Task-number: 251144 Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
| * | refactor some codeThierry Bastian2009-06-121-31/+26
| | | | | | | | | | | | removed qstrdup and used QByteArray to its full extent
generated by cgit v0.12 at 2024-11-15 06:40:07 (GMT)