summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNAM HTTP Code: Uncluttering functionsMarkus Goetz2009-06-253-18/+36
| | | | | | | | Uncluttered and duplicated some function to make it more clear what is happening. Was a bit confusing before if compressed data or uncompressed data is handled. Reviewed-by: Peter Hartmann
* QToolBar: fixed a typo that would make the handle wider.Thierry Bastian2009-06-251-1/+1
|
* QMAinWindow: Fixed autotest compilation after private API changesThierry Bastian2009-06-251-4/+1
|
* Fixed missing restoration of state after a sync in the GL 2 engine.Samuel Rødal2009-06-252-2/+12
| | | | | | | | | The sync() function properly sets up the state to allow using raw OpenGL commands with an active QPainter, but we also need to properly restore the state after sync() has been called and some other painting operation is done. Reviewed-by: Trond
* Fixed buggy clipping when using projective transforms in GL 2 engine.Samuel Rødal2009-06-251-14/+4
| | | | | | | | | | | The gl_Position x, y, and z coordinates are always divided by the homogenuous w coordinate to yield the final coordinates. Since we want the depth to be constant for the whole item we need to premultiply it by the w-coordinate. We can do this in the main() function in the vertex programs since all the vertex programs use the depth uniform, thus simplifying the programs a bit. Reviewed-by: Trond
* Only instantiate the PICT pasteboard MIME when we have to.Norwegian Rock Cat2009-06-251-1/+6
| | | | | | | | | | | 10.6 does a lot of image synthesis for us when we put up a tiff, which is great because we don't have to do a thing and it will work with all the applications out there. This means we don't need our PICT convertor on 10.6 for 32-bit apps. However, this magic doesn't exist in earlier versions of Mac OS X, so we have to keep it around (along with the QuickTime symbol resolving) there. Reviewed-by: Morten Sørvig
* Cannot move fixed size windows using titlebar (only on top edge)Prasanth Ullattil2009-06-251-3/+7
| | | | | | | WM_NCHITTEST has to return the location type based on the position, instead of returning just true or false. Reviewed-by: Marius Storm-Olsen
* Compile with the following defines:msorvig2009-06-251-7/+9
| | | | | | QT_NO_DRAGANDROP QT_NO_ACTION QT_NO_GRAPHICSVIEW
* Flesh out the OpenVG module documentation a bit.Rhys Weatherley2009-06-253-17/+269
| | | | Reviewed-by: trustme
* Document the EGL and OpenVG qmake.conf settings.Rhys Weatherley2009-06-251-0/+65
| | | | Reviewed-by: trustme
* Add Q_CORE_EXPORT to ThreadEngineBarrierRhys Weatherley2009-06-241-1/+1
| | | | | | | | The ThreadEngine template uses functions from ThreadEngineBarrier, so ThreadEngineBarrier must be exported to other libraries/programs that instantiate the template. Reviewed-by: trustme
* Merge branch '4.5'Thiago Macieira2009-06-2410-31/+55
|\ | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * fix crash when using plugin that supplies a QDesignerMemberSheetExtensionJoel Nordell2009-06-241-2/+2
| | | | | | | | | | | | | | | | plugins external to Qt Designer can not define objects inheriting from QDesignerMemberSheet, as that is defined in a private header. the functions isQt3Signal and isQt3Slot assume that all QDesignerMemberSheetExtension objects at QDesignerMemberSheet, but this is not the case with 3rd party plugins. Merge-request: 452 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Thorbjørn Lindeijer
| * Fix comparison of different-sized QStringRefs.Thiago Macieira2009-06-241-1/+1
| | | | | | | | | | | | | | Two strings are only equal if they have the same size. Task-number: 256763 Reviewed-by: TrustMe
| * QColorDialog: Fix setting of alpha valuesMarkus Goetz2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | When alpha was changed and then another color was picked in the GUI still the old alpha remained (good) but it was not returned in the returned color (bad). Task-number: 256164 Reviewed-by: jasplin
| * Backport: Mark tests as XFail until they can be investigated further.Bill King2009-06-241-7/+13
| |
| * These database connections need this parameter to work properly.Bill King2009-06-241-2/+2
| |
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Keith Isdale2009-06-24748-2455/+3949
| |\
| | * bug fix for ibase sql driverDerick Hawcroft2009-06-241-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | - add checks for failed malloc's - convert some of the obvious malloc'ed stuff to use new/delete Task-number: 200217 Reviewed-by: Bill King
| | * Avoid running "make distclean" before there's a Makefile in the test dir.Thiago Macieira2009-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have been bitten by this quite often and I had never found out why suddenly configure decided to erase all my build. It happens that my "make" replacement script command tries to search for a Makefile in the parent dirs (so I can run "make" while inside src/corelib/tools), and this caused the whole build to be erased. Reviewed-by: Trust Me
| | * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | | | | | | | | | | | Mismatch in preprocessor my previous commit.
| | * Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-232-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
| | * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| | | | | | | | | | | | Reviewed-by: mae
| | * Remove these outdated referencesNorwegian Rock Cat2009-06-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't work, the paths are wrong. It's not properly checking the arch, and none of our compilers use it. Unsupported ones might, but I'd rather leave it blank and let them figure out how to do it correctly then lead them down a blind alley. Discussed with Morten Sørvig
| * | Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* fileKeith Isdale2009-06-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | If there is a issue loading the usual .pr* files do not crash qmake. Print out a useful warning if MAKEFILE_GENERATOR is not defined by a loaded .pr* file. Reviewed-by: mariusSO
* | | QDockWidget/Toolbars refactor to avoid list copiesThierry Bastian2009-06-244-109/+110
| | | | | | | | | | | | This also helps understanding the code better.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-241255-148478/+176369
|\ \ \
| * | | Remove dead code (private slot) in QLineEditThierry Bastian2009-06-243-9/+0
| | | | | | | | | | | | | | | | Reviewed-by: janarve
| * | | QLineEdit's context menu now disables cut/copy action in password modeThierry Bastian2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: 256838 Reviewed-by: janarve
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMorten Sørvig2009-06-242-1576/+22
| |\ \ \
| | * | | Kill the drawPantherTab stuff as it's no longer necessary.Norwegian Rock Cat2009-06-242-1576/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now can draw the tab ourselves and use the QStyleHelper to get the drawing correct, so do it all that way. This should also slim the library a little as we also remove all these old pixmaps.
| * | | | Rename ThreadEngineSemaphore -> ThreadEngineBarrierMorten Sørvig2009-06-242-85/+93
| | | | | | | | | | | | | | | | | | | | Also move the implementation to the .cpp file.
| * | | | Improve QtConcurrent scalability.Morten Sørvig2009-06-241-24/+62
| | | | | | | | | | | | | | | | | | | | | | | | | Reduce lock contention QtConcurrent by swiching the ThreadEngineSemaphore class over to a QAtomic-based implementation.
| * | | | Improve QThreadPool scalability.Morten Sørvig2009-06-241-2/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Reduce lock contention: - Skip locking in the accessor functions (where we can) - exit early in tryStart (before locking the mutex) when the threadpool is running at max capacity.
| * | | QXmlStreamWriter: indent comments correctlyPeter Hartmann2009-06-242-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before, there was no newline between a comment and a start element. Now, there is and the comment is correctly indented. Task: 256468 Reviewed-by: Frans Englich
| * | | Fix the painting of item view background when items are disabled.Marius Bugge Monsen2009-06-242-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change QTableView to use the style to draw the background. Change QCommonStyle to draw the background correctly when the item is disabled. Task-number: 250682 Reviewed-by: Jens Bache-Wiig
| * | | Re-apply change 89e6d626f1e23858735659a1596408cd7a521c02 by Friedemann KleintFriedemann Kleint2009-06-241-1/+16
| | | | | | | | | | | | | | | | Commented out code that breaks MinGW. Reviewed-by: Simon Hausmann <shausman@trolltech.com>
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-06-241034-144651/+165637
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-24062009 ( 6d5a2a0472a6af0b7f781da018e76bb8522d57a5 ) ++ b/WebKit/qt/ChangeLog 2009-06-19 Daniel <qt-info@nokia.com> Reviewed by Simon Hausmann. Remove warnings for QString() constructions from const char * By explicitly wrapping it with QLatin1String() / QLatin1Char() * Api/qwebelement.cpp: (QWebElement::classes): Use QLatin1String. (QWebElement::addClass): Ditto. (QWebElement::removeClass): Ditto. (QWebElement::toggleClass): Ditto. 2009-06-18 Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed by Simon Hausmann. Fixed MinGW compilation. * Api/qwebelement.cpp: (QWebElement::evaluateScript): 2009-06-18 Markus Goetz <Markus.Goetz@nokia.com> Reviewed by Simon Hausman. Clarify in docs how to compile with debug information. * docs/qtwebkit.qdoc: 2009-06-17 Markus Goetz <Markus.Goetz@nokia.com> Reviewed by Simon Hausmann. QWebPage: Don't call supportsSsl() This stops QWebPage from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Loading the SSL libraries can be a very slow operation. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl): 2009-06-15 Benjamin C Meyer <benjamin.meyer@torchmobile.com> Reviewed by Adam Treat. Support the back/forward/stop/refresh multimedia keys and accept the event when handling backspace and shift backspace as we should. * Api/qwebpage.cpp: (QWebPagePrivate::keyPressEvent): 2009-06-15 Andre Pedralho <andre.pedralho@openbossa.org> Reviewed by Adam Treat. https://bugs.webkit.org/show_bug.cgi?id=26351 Remove bool QWebHitTestResult::isScrollBar() const and make sure a null QWebHitTestResult is returned instead. * Api/qwebframe.cpp: (QWebFrame::hitTestContent): * Api/qwebframe.h: * Api/qwebpage.cpp: (QWebPage::updatePositionDependentActions): 2009-06-15 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Adam Treat. Fix the logic for disabling the fixed layout feature, when an invalid QSize is set. * Api/qwebpage.cpp: (QWebPage::setFixedContentsSize): 2009-06-13 Adam Barth <abarth@webkit.org> Reviewed by Darin Fisher. https://bugs.webkit.org/show_bug.cgi?id=24492 Move registerURLSchemeAsLocal from FrameLoader to SecurityOrigin. * Api/qwebpage.cpp: (QWebPage::acceptNavigationRequest): Rubber-stamped by Simon Hausmann. 2009-06-09 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Renamed QWebSettings::AllowUniversalAccessFromFileUrls to LocalContentCanAccessRemoteUrls, as discussed in the API review. * Api/qwebsettings.cpp: (QWebSettingsPrivate::apply): (QWebSettings::QWebSettings): * Api/qwebsettings.h: 2009-06-09 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Merged useFixedLayout property with fixedLayoutSize and renamed the latter to fixedContentsSize. * Api/qwebpage.cpp: (QWebPage::fixedContentsSize): (QWebPage::setFixedContentsSize): * Api/qwebpage.h: * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::transitionToCommittedForNewPage): 2009-06-09 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Renamed QWebHitTestResult::linkTarget to linkElement() and made it return a QWebElement. The link target itself is always the target DOM attribute. * Api/qwebframe.cpp: (QWebHitTestResultPrivate::QWebHitTestResultPrivate): (QWebHitTestResult::linkElement): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/tst_qwebframe.cpp:
| * | | Update src/3rdparty/webkit to a new snapshot.Simon Hausmann2009-06-241-1/+1
| | | |
| * | | Reduced number of state changes/uniform location queries in GL2 engine.Samuel Rødal2009-06-244-49/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of uniform locations for the current shader program in the shader manager. Also don't change texture parameters unless necessary. Reviewed-by: Kim
| * | | Save some time.jasplin2009-06-241-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Update documentation to remove mentions of Panther.Norwegian Rock Cat2009-06-241-29/+44
| | | | | | | | | | | | | | | | We no longer support it, so make that obvious in the docs as well.
| * | | Remove some more old Panther code.Norwegian Rock Cat2009-06-241-111/+79
| | | | | | | | | | | | | | | | I still can't kill drawPantherTabs, but that is close.
| * | | QNAM: Removed some dead codeMarkus Goetz2009-06-243-7/+0
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | Remove these colorspace references.Norwegian Rock Cat2009-06-243-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only used for creating the bitmap context, so there is no reason to keep it around. Reviewed-by: Morten Sørvig
| * | | Simplified the tst_QSpinBox::sizeHint() autotest.jasplin2009-06-241-63/+28
| | | | | | | | | | | | | | | | | | | | | | | | Suggested by Jan Arve. Reviewed-by: TrustMe
| * | | Removed trailing whitespace.Jan-Arve Sæther2009-06-242-80/+80
| | | |
| * | | Fixed count(), itemAt() and removeAt() in QGraphicsLinearLayout.Jan-Arve Sæther2009-06-244-29/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to this, the behaviour of count(), itemAt() and removeAt() was different between QGraphicsLinearLayout and QGraphicsGridLayout. QGraphicsGridLayout does it right. This adds some behaviour changes: 1. QGraphicsLinearLayout::count() is no longer affected by inserted stretches (through insertStretch) This means that code like this will break: QGraphicsLinearLayout *linearLayout = new QGraphicsLinearLayout; linearLayout->addItem(new QGraphicsWidget); linearLayout->addStretch(); int count = linearLayout->count(); linearLayout->removeAt(count - 1); // before this patch it would do nothing (and it wouldn't // actually remove the stretch), with the new patch it would // remove the QGraphicsWidget. 2. count(), itemAt() and removeAt() now prints a warning for an invalid index. The documentation actually says that "The reimplementation can assume that index is valid (i.e., it respects the value of count()", but I decided that its too risky to not assume that it is valid, since it would break the following common pattern: while(layout->itemAt(0)) { layout->removeAt(0); } Cleaned up autotests (and a small codeblock) that assumed itemAt/removeAt with an invalid index to work, since we should try to follow our own advice. :-) This change is also an alignment with what QGraphicsGridLayout does (it checks the index argument and prints a warning too.)
| * | | Fixed sizeHint update bug in QSpinBox.jasplin2009-06-243-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSpinBox failed to recalculate its cached size hint when setting the range, prefix, or suffix. Reviewed-by: janarve Task-number: 255051
| * | | Don't refer to non-existing QVGWidget in private header comments.Rhys Weatherley2009-06-242-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme