summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-06-245-22/+42
|\ | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| * 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
| * 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
| * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | | | | | | | Mismatch in preprocessor my previous commit.
| * 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
* | QDockWidget/Toolbars refactor to avoid list copiesThierry Bastian2009-06-244-109/+110
| | | | | | | | This also helps understanding the code better.
* | 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-241-1/+2
| | | | | | | | | | | | | | | | 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:
* | 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
* | 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
* | Fixed count(), itemAt() and removeAt() in QGraphicsLinearLayout.Jan-Arve Sæther2009-06-242-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-0/+10
| | | | | | | | | | | | | | | | 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
* | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-241-0/+6
| | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
* | Put back in these status bar changes for 10.4Norwegian Rock Cat2009-06-232-0/+7
| | | | | | | | | | | | I was a bit overzelous removing them, but they should remain for 10.4 Reviewed-by: Morten Sørvig
* | Reduced button height in standard dialogs on WindowsXP/VistaJens Bache-Wiig2009-06-231-0/+4
| | | | | | | | | | | | | | | | | | This is somewhat related to task 254526. The height of buttons on Vista/XP is a few pixels too tall in standard dialogs because they incorrectly reserve space for a default frame which is not used in these styles. Reviewed-by: prasanth
* | More culling of Panther Code.Norwegian Rock Cat2009-06-2319-691/+249
| | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
* | Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-238-17/+14
| | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
* | Scroll the dirty parts of the scroll area in scrollby for Cocoa.Norwegian Rock Cat2009-06-231-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | Ah! One less ###! The scroll functions in Carbon and Cocoa don't scroll the regions that have been marked dirty. In the past, we killed performance by updating the whole view. We got a workaround for Carbon in the form of an SPI, but I wasn't aware of a corresponding item in the NSView API, but it is there publically and available in 10.5. Fast scrolling in Cocoa now for people who like to use the keyboard. Reviewed by: Morten Sørvig
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-2318-90/+152
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-06-234-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4552f381497b5adc18714d7f6e33eba678e3a9b2 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-23 Thiago Macieira <thiago.macieira@nokia.com> Reviewed by Simon Hausmann. Fix Qt build with Phonon. The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: 2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. Fix NPAPI mouse translation issues on Mac The WindowRef we pass to the plugin refers to the the top level window, so the x and y positions have to be relative to this position, but we have to manually compensate for title bar decorations and other parents of the QWebView since contentsToWindow() only traverses to the QWebView. Previously we did this compensation when passing on mouse coordinates to the plugin, which caused various issues with translations such as not being able to close the Flash settings dialog, or the hand cursor not appearing over links. We now do the compensation as part of the call to NPP_SetWindow, and then pass mouse coordinates in global context without any compensation, similar to how both Safari and Mozilla does it. * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::globalMousePosForPlugin): ++ b/WebKit/qt/ChangeLog 2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com> Reviewed by Ariya Hidayat. Clearifying QWebFrame docs Adding docs to toHtml() and toPlainText() * Api/qwebframe.cpp:
| * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-2313-48/+113
| | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| * Add an error message for building architecture mismatchNorwegian Rock Cat2009-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Snow Leopard defaults to 64-bit if you don't specify an architecture, whereas in the past it defaulted to 32-bit. This isn't a problem for Qt per-se. It *is* a problem if you just build an application that uses Qt but isn't using qmake stuff. To help in those situations, we should error out to let the person know that they need to change their configuration (in any case, the headers are going to complain and they get a much more cryptic message). Reviewed by: Morten Sørvig
| * Added QPen warning when setting dash pattern with non-positive entries.Samuel Rødal2009-06-231-2/+2
| | | | | | | | | | Task-number: 256720 Reviewed-by: Trond
| * Regression against 4.4 in QRectF::operator|.Bjørn Erik Nilsen2009-06-232-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 QRectF handled flat rectangles in the same fashion as QRect does, but that changed with Lars' and Jo's optmizations done in the falcon branch. The difference is that the optimized version only checks whether the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before we bailed out. This regression also introduced a regression in QGraphicsItem::childrenBoundingRect(). Auto-test included. Task-number: 254995 Reviewed-by: Lars
* | Fix option rect offset for QComboBox on Vista styleJens Bache-Wiig2009-06-231-2/+3
| | | | | | | | | | Task-number: 254805 Reviewed-by: prasanth
* | Fixed build error on X11 with gcc 4.1.2.jasplin2009-06-231-6/+6
| | | | | | | | | | | | | | | | gcc 4.1.2 on X11 somehow confuses assignment of a temporarily constructed QSettings object to a reference with invalid access to the private assignment operator of QSettings. Reviewed-by: mgoetz
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2315-61/+104
|\ \ | |/ | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * Fix compilation after the last change.Thiago Macieira2009-06-231-1/+4
| | | | | | | | | | | | | | | | | | The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. Reviewed-By: Marius Storm-Olsen
| * Attempt to fix header installation for Phonon.Thiago Macieira2009-06-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the long-standing issue of whether Phonon headers should be written with a capital P or a lowercase one. KDE releases of Phonon had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>. I tried to solve this before by adding a Phonon subdir next to phonon in include/, but that only compounded the error: the presence of two dirs caused problems and the installation wasn't fixed. So instead try to place Phonon/ClassName inside include/phonon. And fix the installation to do it properly: just copy the include/$lib dir into the target, then overwrite the .h files with the sources from src/$lib. Reviewed-by: Marius Storm-Olsen
| * Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
| | | | | | | | | | | | | | Re-enable fractional coordinates for text output, to produce the same output as regular Carbon/ATSUI applications. Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * make the last checkin compile.Bill King2009-06-231-2/+0
| |
| * Fixes non-unicode strings should be strings, not bytearrays.Bill King2009-06-231-17/+1
| | | | | | | | | | | | Passes all autotests. Task-number: 251739
| * Prevented QWizard from crashing upon removing a page after deleting a field ↵jasplin2009-06-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | object. QWizard crashed when removing a page after deleting an object that was already registered as a field for the page. This patch prevents such a crash by doing the necessary cleanup immediately when the object is deleted. QWizard::removePage() will then see a consistent state in this case. Reviewed-by: janarve Task-number: 255350
| * Fixed drawTiledPixmap() for the GL paint engine.Trond Kjernåsen2009-06-221-7/+13
| | | | | | | | | | | | | | The offset was completely ignored for the GL 1 paint engine. Task-number: 256608 Reviewed-by: Samuel
| * Check for null pointer in QGraphicsProxyWidget::event() in case there is no ↵Marius Bugge Monsen2009-06-221-1/+1
| | | | | | | | | | | | | | focusWidget(). Reviewed-by: Thierry Task-number: 255468
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Marius Bugge Monsen2009-06-221-1/+4
| |\
generated by cgit v0.12 at 2025-01-04 02:46:44 (GMT)