summaryrefslogtreecommitdiffstats
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-251714-35325/+107742
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 multiline doc for Qt::DropAction.Denis Dzyubenko2009-06-121-3/+3
| |
| * Removed \since 4.6 tag, mentioned that only the enum value is since 4.6Denis Dzyubenko2009-06-121-1/+1
| |
| * Fixed bitmap drawing in GL 2 engine when not using GL pixmap backend.Samuel Rødal2009-06-124-4/+19
| | | | | | | | | | | | | | | | | | 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-1217-812/+912
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Use output-path, not relative, when symlinking qvfb-files in configureTor Arne Vestbø2009-06-121-1/+2
| | | | | | | | | | | | | | This gets rid of a few warnings when shadow-building Qt, since the symlinks are no longer created in the source tree. Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
| * 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-1218-110/+323
| |\
| | * 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-125-47/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-43/+31
| | | | | | | | | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie
| | * doc: Fixed several qdoc warnings.Martin Smith2009-06-125-11/+80
| | |
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-12108-263/+504
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
| | * Changes for 4.5.2Leonardo Sobral Cunha2009-06-121-0/+7
| | |
| | * QGraphicsItem::setOpacity(0.0) does not trigger an update of child itemsLeonardo Sobral Cunha2009-06-122-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * keep CONFIG+=silent working with the new translations.pro fileBradley T. Hughes2009-06-121-1/+1
| | |
| | * 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
| | * We do only support files inside or in subdirs of the help project.kh2009-06-112-90/+99
| | | | | | | | | | | | | | | Task-number: 255888 Reviewed-by: kh
| | * Trafficinfo example: One more asynchronous callMarkus Goetz2009-06-111-1/+1
| | | | | | | | | | | | Task-number: 254455
| | * Trafficinfo example: Asynchronous call to webservice at launchMarkus Goetz2009-06-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This makes the main window shown immediatly even when the webservice of traffikanten.no cannot be reached. Does not properly fix the associated task yet, e.g. display an error message. Task-number: 254455
| | * do not make PWD and OUT_PWD have trailing slashes upon returning from a ↵Oswald Buddenhagen2009-06-111-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | SUBDIRS target they don't have initially, either. Reviewed-by: mariusSO
| | * do not append trailing slash to OUT_PWD in nested pro-filesOswald Buddenhagen2009-06-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | the top-level one doesn't have one, either, so this lead to inconsistent behavior depending on whether the pro was processed directly or from a SUBDIRS target. Reviewed-by: mariusSO
| | * remove strange no-opOswald Buddenhagen2009-06-111-1/+0
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * remove dead codeOswald Buddenhagen2009-06-111-8/+0
| | | | | | | | | | | | | | | | | | seems it was never used since the initial checkin Reviewed-by: mariusSO
| | * turn qm generation into a build time targetOswald Buddenhagen2009-06-1146-36/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | consequently, remove the qm files from the repository this uses some really black magic to convince qmake to do the right thing. this will be fixed properly in a later version. Reviewed-by: mariusSO
| | * 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
| | * fix arabic pluralsOswald Buddenhagen2009-06-111-2/+2
| | |
| | * add plural rules for urduOswald Buddenhagen2009-06-111-0/+1
| | |
| | * Fix wrong home shortcut, now set to ALT+Home.kh2009-06-111-1/+1
| | | | | | | | | | | | | | | Task-number: 255875 Reviewed-by: kh
| | * No need to bookmark emty pages.kh2009-06-112-1/+4
| | | | | | | | | | | | Reviewed-by: kh
| | * 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
| | * fix hover selection of source stringsOswald Buddenhagen2009-06-101-0/+2
| | | | | | | | | | | | | | | snatching ctrl-a from line edits seems to need a shortcut override for some time now
| | * Fixed a compile failure on Solaris, really :)Trond Kjernåsen2009-06-101-9/+9
| | | | | | | | | | | | | | | | | | You can't static_cast from a signed to an unsigned type and vice versa. Reviewed-by: Kim
| | * Compilefix for QT_NO_TABLETEVENT and QT_NO_COMPLETERThomas Hartmann2009-06-102-2/+7
| | | | | | | | | | | | | | | Task-number: 253086 Reviewed-by: Joerg
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-06-102-2/+4
| | |\
generated by cgit v0.12 at 2024-11-22 15:41:53 (GMT)