9 years agoFixes: Use QRect::isEmpty() rather than isNull() if possible.
Bjoern Erik Nilsen [Thu, 26 Feb 2009 14:47:04 +0000 (15:47 +0100)]
Fixes:    Use QRect::isEmpty() rather than isNull() if possible.

RevBy:    Andreas
Details:  Note that isNull() implies isEmpty(), but it only catches
          the cases where width and height is 0.

9 years agoFixes: Cleanup calls to QGraphicsViewPrivate::updateRect()/updateRegion()
Bjoern Erik Nilsen [Thu, 26 Feb 2009 14:00:08 +0000 (15:00 +0100)]
Fixes:    Cleanup calls to QGraphicsViewPrivate::updateRect()/updateRegion()

Details:  Checking for QRect::isNull() was wrong in the first place, and
          checking for isEmpty()/isNull() is overhead after

9 years agoFixes: Optimize QGraphicsViewPrivate::updateRect()/updateRegion().
Bjoern Erik Nilsen [Thu, 26 Feb 2009 13:49:47 +0000 (14:49 +0100)]
Fixes:    Optimize QGraphicsViewPrivate::updateRect()/updateRegion().

Details:  Those cut-offs are extremely important. After few seconds
          interaction with the iphone demo, updateRect() was called
          approx. 3000 times with an empty rect. Then imagine what
          happens when having e.g. FullViewportUpdate. We do
          q->viewport()->update() JUST FOR FUN!

9 years agoFixes: Optimize QGraphicsView::itemUpdated.
Bjoern Erik Nilsen [Wed, 25 Feb 2009 11:18:28 +0000 (12:18 +0100)]
Fixes:    Optimize QGraphicsView::itemUpdated.

Task:     -
RevBy:    Andreas
AutoTest: -
Details:  Accumulate the parentToItem transform as we iterate instead of
          creating it from bottom-up each time.

9 years agoDoc - Mentioned what the default filters are for
Kavindra Devi Palaraja [Mon, 6 Apr 2009 11:15:00 +0000 (13:15 +0200)]
Doc - Mentioned what the default filters are for

Task-number: 250285
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
9 years agoRename these files to have lowercase .txt extension.
Thiago Macieira [Mon, 6 Apr 2009 11:16:39 +0000 (13:16 +0200)]
Rename these files to have lowercase .txt extension.

mkdist doesn't case-insensitive comparison.

Reviewed-by: TrustMe
BT: yes

9 years agoInstall the animation.mng file.
Thiago Macieira [Mon, 6 Apr 2009 09:18:34 +0000 (11:18 +0200)]
Install the animation.mng file.

Otherwise, for people who install Qt (everyone outside Nokia), the
animation file isn't present.

Reviewed-by: Trust Me
BT: yes

9 years agoCorrected typo.
jasplin [Mon, 6 Apr 2009 10:43:53 +0000 (12:43 +0200)]
Corrected typo.

Reviewed-by: jasplin
9 years agoDoc - Clarified that button style on X11 platforms may depend on the
Kavindra Devi Palaraja [Mon, 6 Apr 2009 10:39:13 +0000 (12:39 +0200)]
Doc - Clarified that button style on X11 platforms may depend on the
desktop environment.

Task-number: 250338
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
9 years agoRemove QTDIR dependency from moc autotest
Simon Hausmann [Mon, 6 Apr 2009 09:00:05 +0000 (11:00 +0200)]
Remove QTDIR dependency from moc autotest

Use qmake -query QT_INSTALL_HEADERS at test startup time instead of
relying on the dead QTDIR environment variable.

Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
9 years agoMoc autotest cleanup
Simon Hausmann [Mon, 6 Apr 2009 08:58:51 +0000 (10:58 +0200)]
Moc autotest cleanup

Remove unused QTDIR tests.

Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
9 years agoFix moc autotest failures
Simon Hausmann [Mon, 6 Apr 2009 08:38:54 +0000 (10:38 +0200)]
Fix moc autotest failures

We have to pass the correct include paths when testing the multiple
inheritance warning, because we want moc to find the QtGui and QObject

In addition we have to adjust the line numbers and include QObject in
the qobject test to avoid a warning about the unknown QObject

Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
9 years agoBT: Fix a crash when running a widget window modal when it has no parent
Norwegian Rock Cat [Mon, 6 Apr 2009 09:30:45 +0000 (11:30 +0200)]
BT: Fix a crash when running a widget window modal when it has no parent

We changed the logic for determining sheets, but it seems we forgot to
take the parentWidget() into account. It's required for WindowModality
to make any sense.

Reviewed-by: Richard Moe Gustavsen
9 years agoQThread::start(): priority has no effect on Linux systems
Bradley T. Hughes [Wed, 1 Apr 2009 11:04:44 +0000 (13:04 +0200)]
QThread::start(): priority has no effect on Linux systems

The default scheduling policy on Linux doesn't allow specifying thread
priorities, so the priority passed to start() and setPriority() has no
effect. Document this.

Task number: 249997
Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
9 years agoFix up color matching on 64-bit Cocoa.
Norwegian Rock Cat [Mon, 6 Apr 2009 08:20:56 +0000 (10:20 +0200)]
Fix up color matching on 64-bit Cocoa.

It seems that GetThemeTextColor is not available at all for 64-bit
versions of the operating system and there is no good equivalent.
We were using a technique where we would create a small pixmap and then
use HIThemeSetTextFillColor() with the proper enum. However, this
function will silently set a black color if it doesn't know about the
enum. So, we get black when we really shouldn't. It also seems to
produce colors that are a bit different from the Carbon function. So, in
the meantime, just hard code the values in. It might break if you are
hacking the resources in Mac OS X, but we'll have to live with that
until we get a real function.

Task-number: 248918
Reviewed-by: Prasanth Ullattil
9 years agoFix QNetworkReply's automatic pushing of a cache when the cache is
Thiago Macieira [Fri, 3 Apr 2009 14:51:21 +0000 (16:51 +0200)]
Fix QNetworkReply's automatic pushing of a cache when the cache is
more than 64k.

This issue was found by Warwick: the copyReadyRead() slot is called
only once as a result of readyRead(), but since there's no more data
to be received (the source QIODevice is a QBuffer), we'll never get a
readyRead() again.

So, if we don't have a limited buffer size, we should read
everything. This applies to QFile as well.

The side-effect is that we cause the entire QFile to be loaded to
memory, so if you had a 2 GB cache entry, you'll probably run out of

Future optimisations:
 - don't memcpy the data from a QBuffer into another buffer
 - find a way to avoid loading the entire contents of the file
 (probably not possible with the default QNetworkDiskCache since that
 may compress the data, so we won't know the size and thus can't fake

Reviewed-by: Warwick Allison
9 years agoUpdate the qmake documentation regarding when the .qmake.cache is
Andy Shaw [Mon, 6 Apr 2009 06:08:05 +0000 (08:08 +0200)]
Update the qmake documentation regarding when the .qmake.cache is

Reviewed-by: TrustMe
9 years agoMake the configure.exe program work for the commercial release licenses.
Thiago Macieira [Fri, 3 Apr 2009 14:19:50 +0000 (16:19 +0200)]
Make the configure.exe program work for the commercial release licenses.

Reviewed-by: TrustMe
BT: yes

9 years agoAdd some timing capabilities
Anders Bakken [Sat, 4 Apr 2009 00:34:09 +0000 (17:34 -0700)]
Add some timing capabilities

Add some frames-per-second output for debugging when QT_DIRECTFB_TIMING
is defined.

Reviewed-by: Donald <qt-info@nokia.com>
9 years agoQScreen::flush() no longer draws the titlebar
Anders Bakken [Sat, 4 Apr 2009 00:05:19 +0000 (17:05 -0700)]
QScreen::flush() no longer draws the titlebar

We don't need to chain to the base class anymore.

Reviewed-by: Donald <qt-info@nokia.com>
9 years agoSilence warning and beautify code
Anders Bakken [Fri, 3 Apr 2009 23:16:38 +0000 (16:16 -0700)]
Silence warning and beautify code

Even though these variables couldn't really be used uninitialized GCC
4.3.2 thinks it could. This is nicer, more readable and faster anyway.

Reviewed-by: Donald <qt-info@nokia.com>
9 years agoQGtkStyle: Fix styling and palette issues related to combo box
Jens Bache-Wiig [Fri, 3 Apr 2009 16:19:47 +0000 (18:19 +0200)]
QGtkStyle: Fix styling and palette issues related to combo box

Well actually this change is a bit bigger than just that.

*We no longer override the palette you provide in polish so it should
be a bit more frienly toward custom application changes.

* Another issue  was that we  would generate the palette information
when we got the style callback from gtkButton but then the line edits might not yet have been
polished. Hence we now return from the callback and instead post the
update for later.

* We had to modify the PE_Frame entry to draw a raised menu when the
custom combo box delegate was used.

* We now simply ignore custom
qtconfig palette entries when using GtkStyle since they only cause
trouble with it.

Task-number: 250142
Reviewed-by: nrc
9 years agoFixes crash in QTreeView with QSortFilterProxyModel
Olivier Goffart [Fri, 3 Apr 2009 11:35:08 +0000 (13:35 +0200)]
Fixes crash in QTreeView with QSortFilterProxyModel

If we get an hover event while the model gets invalidated, we might ends
up calling itemDecorationAt before the viewitem is refreshed.

Can be reproduced in KTorrent (Relates to KDE bug 172198) or Kopete trunk

Reviewed-by: Thierry
9 years agoDo not loose WindowType flags when setting translucent background in X11
Olivier Goffart [Fri, 3 Apr 2009 11:29:55 +0000 (13:29 +0200)]
Do not loose WindowType flags when setting translucent background in X11

This fixes KRunner on XMonad.   The Qt::Dialog flag of the krunner dialog
was lost when the Qt::WA_TranslucentBackground was set,  leading to
incorrect behaviour in some window manager (such as xmonad)

Reviewed-by: Samuel
9 years agoFix a crash in QFileDialog with a proxy on it.
Alexis Menard [Fri, 3 Apr 2009 11:49:13 +0000 (13:49 +0200)]
Fix a crash in QFileDialog with a proxy on it.
The main problem is that enterDirectory received a QModelIndex that can
be a proxy index and not a source index if there is a proxy set on the
QFileDialog. This fix basically discover some other crashes in the
completer. The problem was that we didn't apply the proxy to the
completer too. So we basically messed up source and proxy indexes.
Both have a proxy set now and convert the model indexes if needed.


9 years agoUse QMAKE_LIBS_OPENGL_QT in the GL ES config tests
Tom Cooksey [Wed, 1 Apr 2009 09:39:09 +0000 (11:39 +0200)]
Use QMAKE_LIBS_OPENGL_QT in the GL ES config tests

The OpenGL ES config tests are there to test if there's enough to build
QtOpenGL, not OpenGL applications using Qt. Therefore we should use
QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely
because Qt needs to link against EGL whereas Qt applications do not.

Reviewed-by: TrustMe
9 years agoAdd config test for XLib
Tom Cooksey [Wed, 1 Apr 2009 09:07:16 +0000 (11:07 +0200)]
Add config test for XLib

Previously, it was entirely possible to successfully configure Qt/X11
without any X11 installed. The problems would only start showing up once
you stated building. This is not very useful if you're cross-compiling
and trying to setup the paths correctly.

Reviewed-by: Denis
9 years agoBT: Compilation on WinCE.
Trond Kjernåsen [Fri, 3 Apr 2009 11:29:20 +0000 (13:29 +0200)]
BT: Compilation on WinCE.

Reviewed-by: Kim
9 years agoUse the standard 'type name = value' variable declaration for POD
Thiago Macieira [Fri, 3 Apr 2009 10:56:01 +0000 (12:56 +0200)]
Use the standard 'type name = value' variable declaration for POD

C++ is nice, but we don't have to use confusing syntax when plain old
C works (and is correct). This apparently fixes a compilation error on
MSVC 6, that doesn't like the constructor-like initialisation for POD

Reviewed-by: Trust Me
BT: yes

9 years agoRemoved usage of NaN in SVG gradients.
Kim Motoyoshi Kalland [Fri, 3 Apr 2009 08:47:07 +0000 (10:47 +0200)]
Removed usage of NaN in SVG gradients.

Since there is no way to find out if gradient stops have been added to a
gradient, a gradient stop at NaN was earlier used in the SVG module to
mark the gradient as empty. This could cause floating point exceptions.
The usage of NaN has now been replaced by a boolean in

Duplicate entry "qxmlpatterns" was removed from auto.pro in the auto
test directory.

Task-number: 250146
Reviewed-by: Samuel
9 years agoFix focus policy propagation bug in QCompleter.
jasplin [Fri, 3 Apr 2009 08:03:56 +0000 (10:03 +0200)]
Fix focus policy propagation bug in QCompleter.

Commit 4a00810cc394b7da99ddb2d13eb045352ede25d3 ensures
that setting the focus policy of a widget applies to its
proxy (if any) as well. This propagation effect is however
unfortunate for a QCompleter in PopupCompletion mode.
The client widget (typically a QLineEdit or a QTextEdit)
acts as the focus proxy to the popup menu. Internally,
the completer sets the focus policy of the popup menu to
NoFocus, but this should not affect the focus policy of
the editor.

Reviewed-by: janarve
Task-number: 250064

9 years agoMy changes
Jarek Kobus [Fri, 3 Apr 2009 06:54:27 +0000 (08:54 +0200)]
My changes

9 years agoSuppress unnecessary "Could not re-create the temporary EGL surface" warnings
Rhys Weatherley [Fri, 3 Apr 2009 02:59:23 +0000 (12:59 +1000)]
Suppress unnecessary "Could not re-create the temporary EGL surface" warnings

The wrong temporary surface id was being used to recreate the EGL
surface.  It was "tempSurface" when it should have been -1.

Reviewed-by: Ian Walters
9 years agoAdd information about QT_* defines that are needed to make PowerVR work
Rhys Weatherley [Fri, 3 Apr 2009 02:17:30 +0000 (12:17 +1000)]
Add information about QT_* defines that are needed to make PowerVR work

The QT_QWS_CLIENTBLIT and QT_NO_QWS_CURSOR defines must be supplied
or the direct paint regions used by the PowerVR driver won't work.

Reviewed-by: trustme
9 years agosome more quoting for qmake ...
Oswald Buddenhagen [Thu, 2 Apr 2009 18:17:33 +0000 (20:17 +0200)]
some more quoting for qmake ...

sometimes, even two reviews are not enough ...

9 years agoAdding auto-tests for commits a2fcc4a5 and 8d500381
João Abecasis [Thu, 2 Apr 2009 15:17:16 +0000 (17:17 +0200)]
Adding auto-tests for commits a2fcc4a5 and 8d500381

Task-number: 244500
Task-number: 244485
Reviewed-by: ossi
Reviewed-by: thiago
9 years agoOnly set system style when it actually changes
Jens Bache-Wiig [Thu, 2 Apr 2009 17:09:52 +0000 (19:09 +0200)]
Only set system style when it actually changes
This issue would cause Qt Creator and similar apps with proxy styles to loose
their custom styling whenever any x11 system settings changed.
This happened because we would re-read the settings and override the
system style even if the system style did not actually change would be set on
the application. We

Task-number: 250199
Reviewed-by: ogoffart
9 years agoMake mkdist-webkit work from in-source builds
Simon Hausmann [Thu, 2 Apr 2009 16:52:51 +0000 (18:52 +0200)]
Make mkdist-webkit work from in-source builds

Explicitly unset QTDIR_build, to make sure we generate Makefiles with
real rules to call the extra tools.

Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
9 years agoMerge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
kh [Thu, 2 Apr 2009 16:03:12 +0000 (18:03 +0200)]
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

9 years agomake relative #include relative to the current file
Oswald Buddenhagen [Thu, 2 Apr 2009 15:55:23 +0000 (17:55 +0200)]
make relative #include relative to the current file

i.e., use "", not <> and thus rely on the include path

9 years agore-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992f
Oswald Buddenhagen [Tue, 31 Mar 2009 12:38:57 +0000 (14:38 +0200)]
re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992f

this time, it can deal with directories which are absolute to start

Reviewed-by: mariusSO
9 years agore-initialize some variables for each file
Oswald Buddenhagen [Thu, 2 Apr 2009 13:12:17 +0000 (15:12 +0200)]
re-initialize some variables for each file

9 years agofix evaluation of CONFIG() and contains()
Oswald Buddenhagen [Thu, 2 Apr 2009 10:02:39 +0000 (12:02 +0200)]
fix evaluation of CONFIG() and contains()

cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206

9 years agofix wrong evaluation of arguments to qmake functions
Oswald Buddenhagen [Thu, 2 Apr 2009 09:55:55 +0000 (11:55 +0200)]
fix wrong evaluation of arguments to qmake functions

cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator

9 years agofixes empty tab after pdf file open, new tab after middle mouse click
kh [Thu, 2 Apr 2009 16:01:47 +0000 (18:01 +0200)]
fixes empty tab after pdf file open, new tab after middle mouse click

Task-number: none
Reviewed-by: --global
9 years agofixes empty tab after pdf file open
kh [Thu, 2 Apr 2009 16:00:34 +0000 (18:00 +0200)]
fixes empty tab after pdf file open

Task-number: none
Reviewed-by: --global
9 years agofixes empty tab after pdf file open
kh [Thu, 2 Apr 2009 15:58:51 +0000 (17:58 +0200)]
fixes empty tab after pdf file open

Task-number: none
Reviewed-by: --global
9 years agomake the configured namespace part of QT_BUILD_KEY
hjk [Thu, 2 Apr 2009 14:42:36 +0000 (16:42 +0200)]
make the configured namespace part of QT_BUILD_KEY

The eclipse integration is namespaced, but it pulls in system plugins like the
oxygen style.  This breaks as the (non-namespaced) style plugin does not find a
suitable QApplication instantiated (only a namespace one is there)

Reviewed-by: thiago
Task-number: 250185

9 years agoSmall changes in qmake's fileFixify
João Abecasis [Thu, 2 Apr 2009 09:03:58 +0000 (11:03 +0200)]
Small changes in qmake's fileFixify

Removed dead code and simplified conditionals. This should not otherwise
change behavior or output of qmake in any way.

Reviewed-by: mariusSO
9 years agoIn qmake tests, allow child environment to be manipulated
João Abecasis [Thu, 19 Mar 2009 12:36:56 +0000 (13:36 +0100)]
In qmake tests, allow child environment to be manipulated

... without having to change the parent process's environment.

Reviewed-by: mariusSO
9 years agoSpring cleaning in qmake tests
João Abecasis [Thu, 2 Apr 2009 13:47:54 +0000 (15:47 +0200)]
Spring cleaning in qmake tests

And some indentation fixes in qmake itself.

Fixes indentation; TRUE => true; FALSE => false; #includes and #defines
cleanup; removes dead code; comments... and somewhere along the way
marked a function static.

Reviewed-by: mariusSO
9 years agoRemove dependency on Qt3 support from qmake tests
João Abecasis [Thu, 19 Mar 2009 11:37:02 +0000 (12:37 +0100)]
Remove dependency on Qt3 support from qmake tests

Qt3 support prevented the tests from running on Mac Cocoa.
Also started some Spring cleaning (it's just around the corner!) and
applied some YAGNI :-)

Reviewed-by: NRC
Reviewed-by: mariusSO
9 years agoDelete temporary file if copy was unsuccessful
João Abecasis [Thu, 2 Apr 2009 09:15:03 +0000 (11:15 +0200)]
Delete temporary file if copy was unsuccessful

This is an untested bugfix -- comes solely from reading the code.

In QFile::copy's fallback implementation a (temporary) file is created
for block copying from the source file. When Qt is built without
temporary file support this doesn't seem to be deleted in case of an
error while block copying or renaming to the final destination.

Reviewed-by: mariusSO
9 years agoRenaming a file does not change QFile's fileName
João Abecasis [Thu, 26 Mar 2009 15:53:18 +0000 (16:53 +0100)]
Renaming a file does not change QFile's fileName

QFile made no attempt to reset the file name on a rename. We now reset
the fileEngine's fileName if it was able to handle the rename.
Otherwise, we call setFileName, which will result in reallocation of the

Task-number: 244485
Reviewed-by: mariusSO
9 years agoQFile::rename didn't always return false when method failed
João Abecasis [Thu, 26 Mar 2009 15:00:14 +0000 (16:00 +0100)]
QFile::rename didn't always return false when method failed

The fallback implementation for rename would return true in some
situations where the move failed. Also the destination file might be
created and left there in these cases.

Task-number: 244500
Reviewed-by: mariusSO
9 years agocosmetic bug in qmake msvc_nmake generator fixed
Joerg Bornemann [Thu, 2 Apr 2009 11:27:03 +0000 (13:27 +0200)]
cosmetic bug in qmake msvc_nmake generator fixed

When generating nmake makefiles, the same inference rules were
generated several times.

Reviewed-by: mariusSO
9 years agoCompleted 4.5.1 changelog for Designer/uic.
Friedemann Kleint [Thu, 2 Apr 2009 11:27:25 +0000 (13:27 +0200)]
Completed 4.5.1 changelog for Designer/uic.

9 years agoDoc - fixing a broken link in the documentation of QWebPage
Kavindra Devi Palaraja [Thu, 2 Apr 2009 11:26:06 +0000 (13:26 +0200)]
Doc - fixing a broken link in the documentation of QWebPage

Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
9 years agoImproved stylesheet support for setting background and foreground roles
Jens Bache-Wiig [Thu, 2 Apr 2009 11:19:42 +0000 (13:19 +0200)]
Improved stylesheet support for setting background and foreground roles

This makes sure that style sheets set both ButtonText and WindowText roles
for all widgets. This fixes among other things the fact that you could not
configure text colors for combo box popups on Mac, Gtk and CleanLooks or
set the background for the whole scrollbar.

Task-number: 160713
Reviewed-by: ogoffart
9 years agoFixing some CoreText errors.
Norwegian Rock Cat [Thu, 2 Apr 2009 10:45:38 +0000 (12:45 +0200)]
Fixing some CoreText errors.

Apparently CoreText is too good for us and always gives us fractional
information. Which would be food for design metrics, but not good for
drawing to the screen. The upshot of it is that we do the ceiling of
every value we get. This is as stop gap solution for the moment. Things
in Creator should look better now.

Also added the ability to disable kerning.

Reviewed-by: Simon Hausmann
9 years agoDoc: Added a note about copying by value in QMetaProperty and included details about...
David Boddie [Thu, 2 Apr 2009 10:49:13 +0000 (12:49 +0200)]
Doc: Added a note about copying by value in QMetaProperty and included details about BlockingQueuedConnection in QMetaObject::invokeMethod().

Task-number: 187869
Task-number: 216742
Reviewed-by: Thiago Macieira
Reviewed-by: Morten Sørvig
9 years agoDoc - moving this file to the Creator branch instead.
Kavindra Devi Palaraja [Thu, 2 Apr 2009 08:42:23 +0000 (10:42 +0200)]
Doc - moving this file to the Creator branch instead.

9 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 9c6a4a25...
Simon Hausmann [Thu, 2 Apr 2009 07:59:19 +0000 (09:59 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( 9c6a4a25fe741b43dd64f5dbaeccfb647cb321fb )

Changes in WebKit since the last update:

++ b/WebKit/qt/ChangeLog
2009-04-02  Takumi Asaki <takumi.asaki@nokia.com>

        Reviewed by Simon Hausmann.

        Fix pre-edit handling of text fields with input methods.

        The input method sends an empty preeditString() if all characters of
        the preedit should be deleted. So inputMethodEvent() has to use
        preeditString() if it's empty.

        * Api/qwebpage.cpp:

2009-03-30  Simon Hausmann  <simon.hausmann@nokia.com>

        Rubber-stamped by Tor Arne Vestbø.

        Document that setHtml/setContent loads only the html/data immediately, not external objects.

        * Api/qwebframe.cpp:
        * Api/qwebview.cpp:

9 years agoduplicate message handling improvements
Oswald Buddenhagen [Wed, 1 Apr 2009 15:51:27 +0000 (17:51 +0200)]
duplicate message handling improvements

- lrelease will not abort on duplicates any more
- lconvert now gets noisy, but only if messages within one file are
  duplicated (combining files with identical messages is ok)
- lupdate stays silent, but will eliminate duplicates again

- consolidate handling of dual-encoded and duplicate messages - for
- instead of the format loader, now the app is responsible for calling
  the duplicate handler. this allows for the fine-grained control
  necessary for optimal performance.

Task-number: 247738

9 years agooptimize duplicate resolution
Oswald Buddenhagen [Wed, 1 Apr 2009 10:26:03 +0000 (12:26 +0200)]
optimize duplicate resolution

use pointers in the index hash to avoid needless allocs and copies

9 years agoDoc - fixed a typo: iterartor -> iterator
Simon Hausmann [Thu, 2 Apr 2009 07:09:28 +0000 (09:09 +0200)]
Doc - fixed a typo: iterartor -> iterator

Reviewed-by: Trust me
9 years agoFix slowdown regression in QGraphicsItem::ItemCoordinateCache
Andreas Aardal Hanssen [Wed, 1 Apr 2009 15:04:50 +0000 (17:04 +0200)]
Fix slowdown regression in QGraphicsItem::ItemCoordinateCache

Right before Qt 4.5.0 was released, Alexis and I submitted change
7e9b000ee418ef2d9c8fadb2c6b8870e0335bd5e, which accidentally introduced
a rounding error causing items whose bounding rect contains fractional
numbers (e.g., QRectF(-0.5, -0.5, 11, 11)), to always be drawn with a
one-pixel strech even if otherwise untransformed. This caused a
significant slowdown for pixmap items and any shape item that uses
almost any pen width != 0, if they enable ItemCoordinateCache.

The fix is to consistently use the aligned rectangle both when generating
the cache pixmap and when drawing it.

Reviewed-by: Alexis
9 years agoSimplify WebKit import script
Simon Hausmann [Thu, 2 Apr 2009 06:11:59 +0000 (08:11 +0200)]
Simplify WebKit import script

Don't require any arguments by default, get the repo path from git config
and updated the default tag.

Reviewed-by: Trust me
9 years agoCleanup and minor fixes of db testcase support code
Bill King [Thu, 2 Apr 2009 00:27:44 +0000 (10:27 +1000)]
Cleanup and minor fixes of db testcase support code

9 years agoDoc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().
David Boddie [Wed, 1 Apr 2009 14:59:51 +0000 (16:59 +0200)]
Doc: Clarified the usage of QImage::dotsPerMeterX() and QImage::dotsPerMeterY().

Task-number: 240164
Reviewed-by: Jan Erik Hanssen <janerik@trolltech.com>
9 years agoDoc: Updated the deployment documentation with the QtScriptTools module and reference...
David Boddie [Wed, 1 Apr 2009 14:38:15 +0000 (16:38 +0200)]
Doc: Updated the deployment documentation with the QtScriptTools module and references to Phonon documentation.

Task-number: 212939
Reviewed-by: TrustMe
9 years agoDoc: Trivial fixes.
David Boddie [Wed, 1 Apr 2009 14:37:14 +0000 (16:37 +0200)]
Doc: Trivial fixes.

Reviewed-by: TrustMe
9 years agoDoc: Minor language fixes and tidying.
David Boddie [Wed, 1 Apr 2009 14:36:19 +0000 (16:36 +0200)]
Doc: Minor language fixes and tidying.

Reviewed-by: TrustMe
9 years agodon't invoke the current item without selection
kh [Wed, 1 Apr 2009 14:18:12 +0000 (16:18 +0200)]
don't invoke the current item without selection

Task-number: none
Reviewed-by: hjk
9 years agodon't open the TopicChooser if no link is avaliable
kh [Wed, 1 Apr 2009 14:17:18 +0000 (16:17 +0200)]
don't open the TopicChooser if no link is avaliable

Task-number: none
Reviewed-by: hjk
9 years agoDoc - clarified that QMessageBox's predefined icons are not defined in
Kavindra Devi Palaraja [Wed, 1 Apr 2009 14:04:58 +0000 (16:04 +0200)]
Doc - clarified that QMessageBox's predefined icons are not defined in
QMessageBox, but provided by the style.

Task-number: 249946
Reviewed-by: TrustMe
9 years agoMarked QWidget::resetInputContext() function as obsolete.
Denis Dzyubenko [Wed, 1 Apr 2009 09:19:26 +0000 (11:19 +0200)]
Marked QWidget::resetInputContext() function as obsolete.

Fixed the behavior of the function that was broken by me some time
ago. But anyway this function is for convenience only since
QInputContext that operates on the widget is available to the user

Reviewed-by: Prasanth Ullattil
9 years agoRemoved obsolete internal function that focuses input context.
Denis Dzyubenko [Wed, 1 Apr 2009 09:04:29 +0000 (11:04 +0200)]
Removed obsolete internal function that focuses input context.

Reviewed-by: TrustMe
9 years agoInput Method cannot be enabled in License Wizard and Class Wizard
Denis Dzyubenko [Tue, 31 Mar 2009 11:40:34 +0000 (13:40 +0200)]
Input Method cannot be enabled in License Wizard and Class Wizard

Input methods didn't work properly wor widgets inside QWizardPage
because the widget got focus before it was shown and input context
wasn't initialized properly. The fix is to postpone
qinputcontext->setFocusWidget call until the widget is created (input
context will be initialized in the QWidget::create_sys function).

Task-number: 244604
Reviewed-by: Prasanth Ullattil
9 years agoSubject: Fix typo in CompositionMode section
Andy Shaw [Wed, 1 Apr 2009 13:06:01 +0000 (15:06 +0200)]
Subject: Fix typo in CompositionMode section
Reviewed-by: TrustMe
9 years agostrip fragment and other parts from url in case of pdf
kh [Wed, 1 Apr 2009 11:34:48 +0000 (13:34 +0200)]
strip fragment and other parts from url in case of pdf

Task-number: part of 238496
Reviewed-by: hjk
9 years agoQTextStream autotest: do not test against "imap.troll.no"
Peter Hartmann [Wed, 1 Apr 2009 11:24:19 +0000 (13:24 +0200)]
QTextStream autotest: do not test against "imap.troll.no"

... but test against the test server.

Reviewed-by: ogoffart
9 years agoQNetworkInterface: fix listing of all interfaces
Peter Hartmann [Wed, 1 Apr 2009 09:21:45 +0000 (11:21 +0200)]
QNetworkInterface: fix listing of all interfaces

Before, we returned 0 for many interfaces because we picked up the IPv6
address regardless whether it was 0 or not.

Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Task-number: 249312

9 years agoQComboBox with Qt::NoFocus triggers a crash.
Prasanth Ullattil [Wed, 1 Apr 2009 10:21:50 +0000 (12:21 +0200)]
QComboBox with Qt::NoFocus triggers a crash.

The showPopup() from a combobox triggers a crash. This happens only for
a combobox which dosen't accept focus and it has been recreated. This is
due to some invalid widget pointer stored in the input context.

Task-number: 249576
Reviewed-by: ddenis
9 years agonormalize file names
Oswald Buddenhagen [Tue, 31 Mar 2009 14:50:43 +0000 (16:50 +0200)]
normalize file names

makes tool tips less ugly

Task-number: 246114

9 years agodo not crash upon dnd-ing text into non-focused lineedit
Oswald Buddenhagen [Tue, 31 Mar 2009 14:11:54 +0000 (16:11 +0200)]
do not crash upon dnd-ing text into non-focused lineedit

Task-number: 249519

9 years agoone more bogus trolltech => qtsoftware rename
Oswald Buddenhagen [Tue, 31 Mar 2009 13:23:53 +0000 (15:23 +0200)]
one more bogus trolltech => qtsoftware rename

9 years agoSubject: Added platform spec. note about type convertion
Morten Engvoldsen [Wed, 1 Apr 2009 08:45:59 +0000 (10:45 +0200)]
Subject: Added platform spec. note about type convertion

Details: Added a note to the description about using POSIX functions for converting between data types such as floats and strings

Task-number: 244600
Reviewed-by: Denis Dzyubenko
Reviewed-by: Geir Vattekar
9 years agoChanges: Clearifying docs on qInstallMsgHandler
Morten Engvoldsen [Mon, 30 Mar 2009 13:10:05 +0000 (15:10 +0200)]
Changes: Clearifying docs on qInstallMsgHandler

Details: Added comment about QT_NO_WARNING_OUTPUT and/or QT_NO_DEBUG_OUTPUT on http://doc.trolltech.com/4.5/qtglobal.html#qInstallMsgHandler

Review-by: Geir Vattekar
9 years agoAdding note to the qFuzzyCompare doc
Morten Engvoldsen [Mon, 30 Mar 2009 11:48:46 +0000 (13:48 +0200)]
Adding note to the qFuzzyCompare doc

Adding note about how comparing using 0.0 will fail, and
an example on how to do it.

Reviewed-by: David Boddie
Reviewed-by: Geir Vattekar
9 years agoSubject: Replaced comment with a better one.
Morten Engvoldsen [Fri, 27 Mar 2009 13:17:51 +0000 (14:17 +0100)]
Subject: Replaced comment with a better one.

Details: Replaced the comment for QButton::setDown(bool). It was kind of narrow.

Reviewed-by: Geir Vattekar
9 years agoSubject: added options to CONFIG in qmake
Morten Engvoldsen [Thu, 26 Mar 2009 15:03:44 +0000 (16:03 +0100)]
Subject: added options to CONFIG in qmake

Details: added some non documented options for COFIG in the qmake manual

Reviewed-by: Geir Vattekar
Reviewed-by: Marius Storm-Olsen
Task-number: 248432

9 years agoSubject: Mention setProxy() should be called before setHost() in the doc
Andy Shaw [Wed, 1 Apr 2009 09:32:41 +0000 (11:32 +0200)]
Subject: Mention setProxy() should be called before setHost() in the doc
Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
9 years agoSubject: A couple of minor doc fixes
Andy Shaw [Wed, 1 Apr 2009 08:30:43 +0000 (10:30 +0200)]
Subject: A couple of minor doc fixes
Reviewed-by: Morten Engvoldsen
9 years agoDB Autotest cleanup
Bill King [Wed, 1 Apr 2009 04:09:00 +0000 (14:09 +1000)]
DB Autotest cleanup

Make db autotest data set generation more consistent, slightly faster.
Also, add ability to easily generate a set of a single databases
entries worth of criteria to test.

9 years agoSubject: Compile fix on Windows
Andy Shaw [Tue, 31 Mar 2009 20:53:52 +0000 (22:53 +0200)]
Subject: Compile fix on Windows
Reviewed-by: Anders Bakken <anders.bakken@nokia.com>
9 years agoDoc: Fixed the screenshots and example description to match the code.
David Boddie [Tue, 31 Mar 2009 17:53:21 +0000 (19:53 +0200)]
Doc: Fixed the screenshots and example description to match the code.

Task-number: 242369
Reviewed-by: TrustMe
9 years agoCompile
Anders Bakken [Tue, 31 Mar 2009 17:40:34 +0000 (10:40 -0700)]

I messed up the cherry-pick merge and left one of these in.

Reviewed-by: TrustMe
9 years agoRemove these convenience functions.
Anders Bakken [Tue, 31 Mar 2009 17:27:59 +0000 (10:27 -0700)]
Remove these convenience functions.

They only make sense under the assumption that there most of the time is
no transform. With Falcon this isn't really the case.

Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
9 years agoNo sense in detecting the format twice
Anders Bakken [Tue, 31 Mar 2009 04:51:33 +0000 (21:51 -0700)]
No sense in detecting the format twice

Use the format passed in to the function rather than detecting it again
based on hasAlphaChannel().

Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>