summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: Move QGLDrawable into qgl_p.h so that we can use it in the GL 2 ↵Samuel Rødal2009-04-014-185/+193
| | | | | | | | paint engine. RevBy: Tom Details: Now we can use the GL 2 paint engine on non-widget paint devices like pixel buffers, framebuffer objects, and GL window surfaces. Using -graphicssystem opengl works now.
* Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-0111-31/+207
|
* Fixed a compile issue on WindowsJens Bache-Wiig2009-03-301-1/+1
|
* Provide a previousInFocusChain for consistancyOlivier Goffart2009-03-302-0/+15
| | | | | Task-number: 201649 Reviewed-by: Thierry
* Merge branch '4.5'Thiago Macieira2009-03-2728-286/+510
|\ | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * Make use of a thread-specific variable in qFlagLocation.Thiago Macieira2009-03-271-2/+18
| | | | | | | | | | We're a bit too deep in the stack here for QThreadStorage. So just use the system support, provided it works.
| * Add the parameter to the function call.Thiago Macieira2009-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently we have a problem with these default parameters. We have basically: template<typename T> void func(T * = 0); template<> void func<Something>(Something *); Now, according to GCC, I can't add "= 0" to the template specialisation. However, MSVC 2008 isn't able to call the specialisation without my extra 0 here. I've seen a similar issue before in QSharedPointer. I don't think this is a big deal because the error message output by MSVC 2008 indicates this is likely a compiler bug: qdbuspendingreply.h(98) : error C2440: 'default argument': cannot convert from 'T1 *' to 'QVariant *' where [ T1=QVariant ]
| * Remove unnecessary debug message.Thiago Macieira2009-03-271-1/+0
| | | | | | | | Reviewed-by: Trust Me
| * Fix crashes in D-Bus due to race conditions.Thiago Macieira2009-03-272-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens in heavily threaded applications: libdbus-1 asks us to add and remove timers (and watches, but those less often) from any thread. Since QObject's model requires that timers and QSocketDescriptors be added only in the object's own thread, we have to sync back to the main thread. However, since D-Bus keeps adding and removing the timers, we have to keep a queue of timers to be added and that list is accessed by any thread. Make sure that list is only accessed in locked conditions. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-03-275-8/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1beae2b64b5b1e9b97e82dc94de18ebac1c19efc ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-03-27 Zack Rusin <zack@kde.org> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=24280 Fix propagation of fill rules when rendering paths in the Qt build. * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::toQtFillRule): (WebCore::GraphicsContext::fillPath): (WebCore::GraphicsContext::strokePath): 2009-03-27 Zack Rusin <zack@kde.org> Reviewed by Tor Arne Vestbø. https://bugs.webkit.org/show_bug.cgi?id=24275 Fix text field theming in the Qt build with the KDE 4 Oxygen style by adjusting the size vertically and horizontally to set padding on the element equal to the width of the style painted border. * platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::RenderThemeQt): (WebCore::RenderThemeQt::computeSizeBasedOnStyle): (WebCore::RenderThemeQt::adjustTextFieldStyle): (WebCore::RenderThemeQt::paintTextField): * platform/qt/RenderThemeQt.h:
| * Fix Qt3Support compileBradley T. Hughes2009-03-271-0/+1
| | | | | | | | Reviewed-by: thiago
| * QDesktopWidget::resized wasn't emitted properly on X11.Denis Dzyubenko2009-03-271-6/+15
| | | | | | | | | | | | | | | | | | | | When the size of one of the screen changes but the geometry of the whole desktop hasn't been changed the resized() signal wasn't emitted. The patch by Lubos Lunak also adds emitting of a signal whenever the screen is turned on or off. Task-number: 226048 Reviewed-by: Brad
| * Crash in OpenGL paint engine when brush style is Qt::NoBrush.Samuel Rødal2009-03-271-0/+3
| | | | | | | | | | | | | | Check for Qt::NoBrush and return early in the composite() function. Task-number: 249628 Reviewed-by: Trond
| * Small fix: initialise the global static isDebugging variable within theThiago Macieira2009-03-271-2/+1
| | | | | | | | | | | | | | | | acquire guard of the local static. This only buys us one warning less by helgrind. Reviewed-by: Trust Me
| * Make QMutexPool actually be thread-safe (double-checked locking doesn'tThiago Macieira2009-03-272-13/+6
| | | | | | | | | | | | | | | | | | work) This code was apparently mostly unchanged since 2005. Update it to match the atomics code. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Major surface related fixAnders Bakken2009-03-276-217/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | Make sure all QDirectFBPaintDevice surfaces always are created with a format that is either QScreen::pixelFormat() or QDirectFBScreen::alphaPixmapFormat(). Also, clean up surface creation by providing more high level functions. Fix a bug where we would assume that ARGB means Format_ARGB32_Premultiplied and not Format_ARGB32. Reviewed-by: Tom Cooksey
| * Fix background of QAbstractScrollArea when styled only with pseudo-classOlivier Goffart2009-03-271-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This may happen if you only have something like QAbstractScrollArea:focus { background: foo; } and you do not have a background set for the general case and the viewport has a different background role (such as QTextEdit, QAbstractItemView, ....) This is a regression from 4.4 since in 4.4 the :focus has no effect if you didn't have a background for the general case. Reviewed-by: bnilsen Task-number: 188195
| * Fix very slow stroking of paths in X11 paint engine.Samuel Rødal2009-03-274-14/+24
| | | | | | | | | | | | | | | | Use QStroker::setRect() to avoid dashing parts of the path that are outside the device rect. Task-number: 246573 Reviewed-by: Trond
| * Fix mismatch between stroke and fill of ellipses on X11.Samuel Rødal2009-03-271-7/+3
| | | | | | | | | | | | | | | | | | | | When drawing ellipse without stroke we need to use the same width/height for the fill as we would use for the stroke for the stroke and fill to match. Filling first and then stroking should produce the same result as filling and stroking in one go. Task-number: 249490 Reviewed-by: Trond
| * Fix QPixmap::fromImage() bug for monochrome images on Mac.Samuel Rødal2009-03-271-1/+1
| | | | | | | | | | | | | | | | Monochrome images should be converted to black and white, not transparent and white. Reported on qt-interest. Task-number: 249175 Reviewed-by: Trond
| * don't include uic in non-gui configurationsOswald Buddenhagen2009-03-271-0/+1
| | | | | | | | | | | | | | | | | | uic is set in default_pre. this leads to useless -I compiler flags when no ui files are used in fact, so it would be nice to get rid of it in cases where it is not used. for backwards compat, don't remove it from the _pre, but add some magic to _post to remove it again if QT does not contain gui. of course, we need a force_uic CONFIG to enable an exception for QtGui itself ...
| * optimizeOswald Buddenhagen2009-03-271-1/+1
| | | | | | | | | | the exact length of the template is known, so there is no point in using the more complex (and thus potentially slower) strncmp instead of memcmp.
| * remove pointless checkOswald Buddenhagen2009-03-271-2/+1
| | | | | | | | this function is always called with found != 0 nowadays
| * most definitely NOT \since 4.5Oswald Buddenhagen2009-03-271-2/+0
| |
| * Creating a native window handle doesn't reset input context on X11.Denis Dzyubenko2009-03-271-1/+10
| | | | | | | | | | | | | | | | When the current focus widget enforces the creation of the native window handle we should reset the input context. Task-number: 249578 Reviewed-by: Brad
| * Creating an instance of the QDesktopWidget breaks clipboard on X11.Denis Dzyubenko2009-03-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | On X11 when user manually creates a QDesktopWidget object it breaks notifications from the root window since we have several QDesktopWidgets that have the same native window id and the wid->qwidget mapper (QWidgetPrivate::mapper) goes crazy. So whenever we get x11 event from the root window we cannot find a qwidget that corresponds to the window id and discard these events. Reviewed-by: Brad
* | Style QDial to look betterJens Bache-Wiig2009-03-279-110/+377
| | | | | | | | | | | | | | | | | | | | This widget has been needing an update in appearance for years as it is still featured in our style gallery. This introduces a new and better looking nob control to cleanlooks, gtk, mac, windows xp, vista and cleanlooks. Reviewed-by: nrc Task-number: 159934
* | Clear QLineEdit selection when redoing a delete operation.jasplin2009-03-271-0/+2
| | | | | | | | | | | | | | | | Deleting text in a QLineEdit should never leave a non-empty selection. This is now reflected properly in the redo function. Reviewed-by: janarve Task-number: 248948
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-266-3/+157
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-261-0/+2
| | | | | | | | | | | | | | | | | | | | commit b1220858d9c15b661b7825e733be448ea9962895 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:37:47 2009 +0100 Doc: Added information about the default value of QGraphicsTextItem::tabChangesFocus(). Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 20864878d046b2ce6bf5fc54868be8df346ce0c8 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:30:32 2009 +0100 Doc: Fixed qdoc warning by adding more descriptive text. Reviewed-by: TrustMe commit 3b620a0a4d1b02105c9761384a5abc4ecf11e9d2 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:29:56 2009 +0100 Doc: Added macros for future use. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-261-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Fix a bug where lineedits in a second page of a stack widget would not get ↵Norwegian Rock Cat2009-03-263-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key events. We need to be more explicit in setting the first responder, and a bit more agressing about rejecting it when called with no responder. It seems that Cocoa has a tendency to reset the first responder when lots of widgets get hidden or shown. During this it will call "makeFirstResponder" on the window with a nil responder. Doing this will reset our what Cocoa thinks is the focus widget, but Qt will still show a focus widget. The way to solve it is to reject the make first responder if the responder is nil. I'm not sure if there will be far reaching implications for this, but it seems to be doing the right thing at the moment. We also need to share this code between QCocoaWindow and QCocoaPanel. Thanks to the dynamic nature of objective-C we have to have a copy of the code in both places. It's unfortunate. Finally, it's also important to have the QWidget let Cocoa know it has focus after it has been created. So, make sure that is in sync. Task-number: 249296 Reviewed-by: Prasanth Ullattil
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2617-26/+99
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-03-266-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b6fc217c2b853827926313c09bb3c32f66ffe43 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-06 Dirk Schulze <krit@webkit.org> Reviewed by Simon Hausmann. Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get the context transparent. [QT] clearRect fill's a given rect with white https://bugs.webkit.org/show_bug.cgi?id=23728 * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::clearRect): ++ b/WebKit/qt/ChangeLog 2009-03-26 Simon Hausmann <simon.hausmann@nokia.com> Rubber-stamped by Tor Arne Vestbø. Fix the documentation of the QLocale usage in userAgentForUrl. * Api/qwebpage.cpp: 2009-03-20 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. Fix for InsertParagraphSeparator and InsertLineSeparator so that QWebPage::action() creates QActions for them. Also make sure they get updated appropriately. * Api/qwebpage.cpp: (QWebPagePrivate::updateEditorActions): (QWebPage::action): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::textEditing):
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-03-261-1/+2
| |\
| | * Fix regression in qscriptvalue_cast (primitive-->complex type cast)Kent Hansen2009-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qscriptvalue_cast implementation was changed from 4.4 to 4.5 because of the introduction of QScriptValue constructors that don't take an engine pointer. However, when the old constructors are used, the behavior of qscriptvalue_cast should be as before, which this patch ensures. In short: If we have an engine pointer, use it. Task-number: 248802 Reviewed-by: Ariya Hidayat
| * | Doc - added QHostInfo to QHostAddress' See Also line, as requested byKavindra Devi Palaraja2009-03-261-1/+1
| |/ | | | | | | | | | | | | the task. Task-number: 249423 Reviewed-by: TrustMe
| * Fix crash when accessing newly constructed QTextObjects.Benjamin Poulain2009-03-267-10/+26
| | | | | | | | | | | | | | | | | | The pieceTable member was only initialized by QTextDocumentPrivate _after_ the call to createObject. This patch initializes it at construction time. Task-number: 246138 Reviewed-by: Simon Hausmann
| * Reduce the number of calls to QThread::idealThreadCount() in QtConcurrent.Morten Sørvig2009-03-261-4/+6
| | | | | | | | | | | | | | | | This results in a syscall and is very slow. Make the call once and cache the value. Task-number: 244718 Reviewed-by: TrustMe
| * Fix regression where QMacStyle would only draw tabs w/QStyleOptionTabV3.Norwegian Rock Cat2009-03-261-7/+10
| | | | | | | | | | | | | | | | | | This is a good example of how to not use QStyleOption when added new features. It's important to start with the most compatible and then cast to the more specific versions to get the new fields. Task-number: 248769 Reviewed-by: Jens Bache-Wiig
* | Merge branch '4.5'Rohan McGovern2009-03-263-6/+82
|\ \ | |/ | | | | | | Conflicts: tests/auto/selftests/tst_selftests.cpp
| * alphaMask needs to be const, because first bytesPerLine() is called and then ↵Alessandro Portale2009-03-251-1/+1
| | | | | | | | bits(). The non-const bits() may detach and realign the data, so that the previous result of bytesPerLine() ist invalid. On S60, we actually had a 'skew' effect because of that.
| * QGtkStyle: Support styled QFrameJens Bache-Wiig2009-03-251-0/+65
| | | | | | | | | | | | | | | | | | | | This makes QGtkStyle style QFrame. In order to avoid negatively affecting the performance we cheat by using a border image without the center part filled. GtkScrolledWindow style is used as QFrame is generally mapped to item views. 249363 ogoffart
| * Fix flipping.Anders Bakken2009-03-251-5/+16
| | | | | | | | | | | | | | | | Fixes two bugs with regards to Flip(). We blit'ed the boundingRect of the updated region rather than each rect which is wasteful. More importantly we ignored the offset which would lead to painting errors. Reviewed-by: Tom Cooksey
* | Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | | | | | RevBy: TrustMe
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2516-1111/+1040
|\ \ | |/
| * Clean up locking/unlockingAnders Bakken2009-03-251-21/+11
| | | | | | | | | | | | | | | | Store the QDirectFBPaintDevice we're painting and use this when unlocking/locking instead of working on QPaintEngine::device() which isn't necessarily the same. Reviewed-by: Tom Cooksey
| * Minor code cleanupAnders Bakken2009-03-251-3/+4
| | | | | | | | | | | | Improve readability of code. Reviewed-by: Tom Cooksey
| * Make QDirectFBPaintDevice() protected.Anders Bakken2009-03-251-5/+7
| | | | | | | | | | | | | | This class should never be instantiated without being subclassed so a protected constructor is the clean thing to do. Reviewed-by: Tom Cooksey
generated by cgit v0.12 at 2024-10-25 23:29:53 (GMT)