8 years agoDoc: Fixed qdoc warnings. v4.7.0-rc1
Jesper Thomschutz [Tue, 24 Aug 2010 13:25:45 +0000 (15:25 +0200)]
Doc: Fixed qdoc warnings.

Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)



8 years agoDoc: updating getting started docs - not finished
Jesper Thomschutz [Tue, 24 Aug 2010 12:53:10 +0000 (14:53 +0200)]
Doc: updating getting started docs - not finished
(cherry picked from commit b83f3a98fe5688872b4bd9a871e544951cb33e29)



8 years agoMake it possible again to build Qt without webkit
Simon Hausmann [Tue, 27 Jul 2010 11:46:00 +0000 (13:46 +0200)]
Make it possible again to build Qt without webkit

Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt,
because it is only meaningful for separate builds of WebKit.

(Real fix is in the import script that takes care of always
removing that line)

Task-number: QTBUG-12456
Discussed-with: axis
(cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)

8 years agoDoc: fixing creator bugs, removing menus and textbox in the header
Morten Engvoldsen [Fri, 20 Aug 2010 12:00:36 +0000 (14:00 +0200)]
Doc: fixing creator bugs, removing menus and textbox in the header
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)

8 years agoFixing qdoc index file...Commit hack to work around the massive amounts of dependenci...
Jesper Thomschutz [Mon, 23 Aug 2010 11:33:04 +0000 (13:33 +0200)]
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Rev-by: MortenE
8 years agoDoc: Fixing overlapping text in header list
Morten Engvoldsen [Wed, 18 Aug 2010 11:37:21 +0000 (13:37 +0200)]
Doc: Fixing overlapping text in header list
(cherry picked from commit ccb77caba466fe0e4d28a809129513cefdbd5575)

8 years agoUse Ctrl rather than Alt for switching tabs in the demo browser
Tor Arne Vestbø [Thu, 19 Aug 2010 15:27:10 +0000 (17:27 +0200)]
Use Ctrl rather than Alt for switching tabs in the demo browser

Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts,
for example Norwegian, which prevents you from typing the @ symbol.

Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 5b177dd50d1ea0eb9130c631757a687782a23cd3)

8 years ago Doc: add link to new gettings started to index.html
Geir Vattekar [Wed, 28 Jul 2010 09:03:00 +0000 (11:03 +0200)]
Doc: add link to new gettings started to index.html
(cherry picked from commit 613ab517f46085580e81684cd5072f8c90fe84d5)

8 years agoDoc: Fixing bug involving header misplacement in Creator style
Morten Engvoldsen [Wed, 11 Aug 2010 10:45:58 +0000 (12:45 +0200)]
Doc: Fixing bug involving header misplacement in Creator style

Task-number: QTBUG-11408
(cherry picked from commit 997e4161cf937aa34a16bb2e708fa1bc7909355f)

8 years agoCocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15
Richard Moe Gustavsen [Tue, 17 Aug 2010 15:33:42 +0000 (17:33 +0200)]
Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15

The reason is that we tried to fix the stacking order of child windows
while we fixed a crash. But the patch turned out to break an auto-test

Reviewed-by: prasanth
(cherry picked from commit 749ad26d255327c9fa3fe857a30983cc6dfef0d9)

8 years agoRevert "Fix the rendering of lines with the X11 paint engine"
Samuel Rødal [Wed, 18 Aug 2010 15:17:15 +0000 (17:17 +0200)]
Revert "Fix the rendering of lines with the X11 paint engine"

This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6,
which broke fill / outline consistency, and when trying to fix that
by rounding the fill the same way that broke rendering in Creator.

Unfortunately the X11 paint engine is too sensitive to changes, there
have already been tons of patches to make it as consistent as possible.
It's simply not possible to get the same rounding for both fill and
outlines and at the same time have consistency between fill and outline
(no holes or fill outside the outline), while using the integer based
Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11
paint engine will be a legacy.

Reviewed-by: Trond
(cherry picked from commit 041a68007413a20a9a9c97d0f2f04f9e03428f67)

8 years agoRevert "Outline / fill inconsistency in X11 paint engine."
Samuel Rødal [Wed, 18 Aug 2010 15:06:19 +0000 (17:06 +0200)]
Revert "Outline / fill inconsistency in X11 paint engine."

This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443.

Reviewed-by: Trond
(cherry picked from commit 3014b427aa8700890f9bd8ea2a0300fc152bf3d2)

8 years agoOutline / fill inconsistency in X11 paint engine.
Samuel Rødal [Tue, 17 Aug 2010 08:45:17 +0000 (10:45 +0200)]
Outline / fill inconsistency in X11 paint engine.

Change ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6 broke outline / fill
consistency in the X11 engine. Since the positioning of lines is more
important we'll round the fill coordinates the same way.

The bug was visible in the filltest.qps arthur test.

Reviewed-by: Gunnar Sletta
(cherry picked from commit ff405f5623d7ed18c881c097368e3e9afd2e9443)

8 years agofix loading of module configs
Oswald Buddenhagen [Fri, 6 Aug 2010 16:17:22 +0000 (18:17 +0200)]
fix loading of module configs

do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.

Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698

8 years agoPrevented Xorg crash in qtdemo when running corkboards example.
Samuel Rødal [Tue, 17 Aug 2010 08:29:03 +0000 (10:29 +0200)]
Prevented Xorg crash in qtdemo when running corkboards example.

The crash happens in the Nvidia driver in glXReleaseTexImageEXT when
scrolling the corkboard using the mouse. To work around it we detect the
Nvidia driver versions where this is known to be a problem and skip
using the texture from pixmap extension in those cases.

Task-number: QTBUG-12914
Reviewed-by: Trond
(cherry picked from commit a76b8bf67696ae69888cc6237417e7c8f07f8da6)

8 years agoCocoa: parent windows shows on screen when they should be hidden
Richard Moe Gustavsen [Tue, 17 Aug 2010 08:08:20 +0000 (10:08 +0200)]
Cocoa: parent windows shows on screen when they should be hidden

The reason is the cocoa method that adds a window as a child of another,
it ends up showing both the parent and the child window regardless.
And this could in some cases also cause a crash.
So we therefore need to be careful when calling that function, and be
sure that the parent is actually visible. In addition, addChildWindow
reset the stacking level of the child window, and made e.g. normal
child windows pop in front of tool child windows. This could easily
be seen in e.g. Designer.

Task-number: QTBUG-12866
Reviewed-by: prasanth
(cherry picked from commit cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15)

8 years agoMake this constructor explicit in Qt too.
Aaron McCarthy [Fri, 13 Aug 2010 04:01:52 +0000 (14:01 +1000)]
Make this constructor explicit in Qt too.
(cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)

8 years agoFix configure -help output. declarative module is built by default.
Martin Jones [Fri, 13 Aug 2010 00:10:38 +0000 (10:10 +1000)]
Fix configure -help output.  declarative module is built by default.

Task-number: QTBUG-12840
(cherry picked from commit d904fe2273be5d39b54b987eef6b9cc0d1b85c4b)

8 years agoCompile on Symbian
Martin Jones [Wed, 11 Aug 2010 03:58:08 +0000 (13:58 +1000)]
Compile on Symbian

Task-number: QTBUG-12771
(cherry picked from commit e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20)

8 years agoDon't destroy ListModel child list nodes.
Martin Jones [Wed, 11 Aug 2010 00:04:53 +0000 (10:04 +1000)]
Don't destroy ListModel child list nodes.
These are owned by the root and must not be destroyed by child lists.

Task-number: QTBUG-12771
Reviewed-by: Bea Lam
(cherry picked from commit 4026b2c7bc91f8f25f73b182687d5d2bed823217)

8 years agodiagramscene example: fix leak and crashes.
Olivier Goffart [Fri, 13 Aug 2010 10:23:46 +0000 (12:23 +0200)]
diagramscene example: fix leak and crashes.

In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)

Also avoid leak by giving parents to objects that needs it, and destroying items.

Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
(cherry picked from commit 5dedcd3c4cac993949295d109804a8f7cc3a5b0a)

8 years agoOnly modify pixmap cache reply when protected by a mutex
Aaron Kennedy [Thu, 12 Aug 2010 02:38:53 +0000 (12:38 +1000)]
Only modify pixmap cache reply when protected by a mutex

(cherry picked from commit ee7c3b576ced47d3b68da1913cdf6995144bddd2)

8 years agoDrawer widget in a MainWindow disappears after returning from full screen mode.
Carlos Manuel Duclos Vergara [Fri, 23 Jul 2010 15:03:42 +0000 (17:03 +0200)]
Drawer widget in a MainWindow disappears after returning from full screen mode.

The problem was in the toggleDrawer function. We were not checking the
status of the last transition before setting the new transition, so
all the transition were treated as non-intentional.

Task-number: QTBUG-11373
Reviewed-by: Prasanth
(cherry picked from commit 725d8e061ededee9a5ddf0914aabd0f6aa2ee741)

8 years agoModification of def files for non existing functions.
Toby Tomkins [Wed, 18 Aug 2010 03:52:04 +0000 (13:52 +1000)]
Modification of def files for non existing functions.

Task-number: QT-2027
Reviewed-by: Joona Petrell
8 years agoUpdate QtGui def files
Joona Petrell [Tue, 17 Aug 2010 03:29:08 +0000 (13:29 +1000)]
Update QtGui def files

Reviewed-by: Martin Jones
(cherry picked from commit 875d5e374dce3dd7d7cce87b55e277e8e9497044)

8 years agoUpdate QtDeclarative def files
Joona Petrell [Tue, 17 Aug 2010 03:29:08 +0000 (13:29 +1000)]
Update QtDeclarative def files

Reviewed-by: Martin Jones
(cherry picked from commit cf0f53ecefd6914d533ffea057748480e3e5bd33)

8 years agoFix check to remove unnecessary deployments in Symbian
Miikka Heikkinen [Fri, 13 Aug 2010 10:25:46 +0000 (13:25 +0300)]
Fix check to remove unnecessary deployments in Symbian

Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths

Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
(cherry picked from commit 448a8603bb0609bf880a2c1b92b26c2005e1cf63)

8 years agoFix "installer_sis" and "deploy" targets when TARGET has path
Miikka Heikkinen [Fri, 13 Aug 2010 12:22:25 +0000 (15:22 +0300)]
Fix "installer_sis" and "deploy" targets when TARGET has path

Dependencies got generated wrong in Makefile because sis is always
created in the .pro file directory but dependency included path
that was in TARGET.

Task-number: QTBUG-12884
Reviewed-by: Shane Kearns
(cherry picked from commit 434ce6748ea7f082357b6d7ab542c9fa2285bd4c)

8 years agoFix QProcessManager destruction
Miikka Heikkinen [Mon, 16 Aug 2010 13:09:34 +0000 (16:09 +0300)]
Fix QProcessManager destruction

If QProcessManager destructor is ran as part of global static cleanup,
manager thread will most likely be terminated by kernel at that point,
so trying to delete QProcessActives and QProcessMediators will panic as
they will still be active. They can also no longer be properly canceled
as the thread is already gone. In case manager thread has already died,
which implies that process exit is imminent, we simply do nothing and
let the deletion of the main heap at process exit take care of stray

Task-number: QTBUG-11218
Reviewed-by: Janne Koskinen
(cherry picked from commit 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f)

8 years agoqdoc: Added the fix to change qml-qml-file.name to qml-file.name
Martin Smith [Fri, 13 Aug 2010 12:01:49 +0000 (14:01 +0200)]
qdoc: Added the fix to change qml-qml-file.name to qml-file.name
(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)

8 years agoCocoa: Stacking order of modal dialogs is wrong
Richard Moe Gustavsen [Fri, 13 Aug 2010 12:05:17 +0000 (14:05 +0200)]
Cocoa: Stacking order of modal dialogs is wrong

Modal dialogs were sometimes hidden behind other normal windows
on screen. The reason was that, upon going modal for a window, we
actually resat the stacking level on the window in a faulty
attempt to respect any stays-on-top window flags. This patch
makes sure we avoid doing that, and at the same time, ensures
we don't reintroduce the original bug as well.

Task-number: QTBUG-12841
Reviewed-by: cduclos
(cherry picked from commit 6d0d767e63df3c997d6d7a8cb6cd4bf8c0dfc835)

8 years agoMultiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)
Prasanth Ullattil [Fri, 13 Aug 2010 10:27:55 +0000 (12:27 +0200)]
Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)

Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special
Characters' item to the 'Edit' menu. Before adding a new entry it will
make sure that menu items list doesn't contain an item with the selector
'orderFrontCharacterPalette' & a 'nil' target. We need to return the
index for the first entry (we have QCocoaMenuLoader as target).

Task-number: QTBUG-12842
Reviewed-by: Denis
(cherry picked from commit b52da4ab2179079a6aff95891786d2f6598048b5)

8 years agoDoc: removed assistant style and reintroduced the index page icons.
Morten Engvoldsen [Fri, 13 Aug 2010 13:20:36 +0000 (15:20 +0200)]
Doc: removed assistant style and reintroduced the index page icons.
(cherry picked from commit 2dfd16e8a138da9d903b31ef461331016d16ec5b)

8 years agoqdoc: All references to -assistant and -base were removed.
Martin Smith [Thu, 12 Aug 2010 07:09:20 +0000 (09:09 +0200)]
qdoc: All references to -assistant and -base were removed.

Flags allowed are now -creator and -online. -creator is
the default.
(cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)

8 years agoqdoc: added application flags in doc.pri and fixed QTBUG-12388
Martin Smith [Thu, 5 Aug 2010 12:56:50 +0000 (14:56 +0200)]
qdoc: added application flags in doc.pri and fixed QTBUG-12388

Task-nr: QTBUG-12388
(cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)

8 years agoProperly emit geometryChanged() when the position change.
Alexis Menard [Thu, 12 Aug 2010 12:31:24 +0000 (14:31 +0200)]
Properly emit geometryChanged() when the position change.

Also emit the signal at the very end, so people can rely on the resize
event to adjust some stuff in their item.

(cherry picked from commit 3ee89bc0830f69d44f272eff5a0c886bff33c92e)

8 years agoQAudioOutput(ALSA); Fix check for available devices.
Justin McPherson [Thu, 12 Aug 2010 06:32:11 +0000 (16:32 +1000)]
QAudioOutput(ALSA); Fix check for available devices.

ALSA can return a list of one empty item when no devices are available.

Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
(cherry picked from commit baf8eabd2c647d6ba2bf0a9dc5103f4726808c3d)

8 years agoDoc: fixing examples link
Morten Engvoldsen [Fri, 9 Jul 2010 12:33:16 +0000 (14:33 +0200)]
Doc: fixing examples link
(cherry picked from commit 653f180d4697e0c7ec1c58022622d5d140e7fda8)

8 years agoMake bld.inf target in Symbian mkspecs to depend on .pro file
Miikka Heikkinen [Thu, 12 Aug 2010 12:03:06 +0000 (15:03 +0300)]
Make bld.inf target in Symbian mkspecs to depend on .pro file

Changes to .pro file weren't previously noticed and therefore
qmake wasn't rerun. Qmake command itself was also incorrect.

Task-number: QTBUG-12716
Reviewed-by: Shane Kearns
(cherry picked from commit 142ce4d38094f1588b04758a6f9ff6787a784fe3)

8 years agoGcce building support for symbian-sbsv2
Miikka Heikkinen [Wed, 11 Aug 2010 09:46:59 +0000 (12:46 +0300)]
Gcce building support for symbian-sbsv2

It is now possible to use "release-gcce" and "debug-gcce" targets
in symbian-sbsv2 mkspec. Exports and cleans should also now work
properly for all target platforms under symbian-sbsv2.

Task-number: QTBUG-12762
Reviewed-by: Jason Barron
(cherry picked from commit bdfbedf971f3e9ef99977652308b9e2b1c213210)

8 years agoAdded files that had been renamed.
Kevin Wright [Tue, 27 Jul 2010 07:32:59 +0000 (09:32 +0200)]
Added files that had been renamed.
(cherry picked from commit a98af1c7f1bba3c791d08e76e4896e48ea6ea019)

8 years agoqdoc: Added list of all members (including inherited) page to QML elements.
Martin Smith [Wed, 11 Aug 2010 09:29:07 +0000 (11:29 +0200)]
qdoc: Added list of all members (including inherited) page to QML elements.
(cherry picked from commit 62968f33452016b31020e524fa6ba6d2cefd0278)

8 years agodoc: The QML Qt element was missing from the documentation.
Martin Smith [Wed, 11 Aug 2010 13:32:28 +0000 (15:32 +0200)]
doc: The QML Qt element was missing from the documentation.

Either someone removed the QML: prefix, or it was never there.
(cherry picked from commit a4d19eef86b07d670b8b2a3f9ad6b3448800bae5)

8 years agoDisable minRightBearing optimization in QTextLayout on Mac
Eskil Abrahamsen Blomfeldt [Wed, 11 Aug 2010 09:49:35 +0000 (11:49 +0200)]
Disable minRightBearing optimization in QTextLayout on Mac

Neither of the Mac font engines have implemented minimum right bearing,
which will cause them to return 0 for the minimum value. This will
cause the right bearing to never be calculated prior to breaking
and thus never be a part of the breaking width. Since actually
implementing the functions is too time consuming for right now, we
will disable the optimization for the time being.

Reviewed-by: Olivier
(cherry picked from commit bb696453f6f87cad58982af3455335478fedb8cc)

8 years agoFix scrollbar randomly popping up in QPlainTextEdit
Eskil Abrahamsen Blomfeldt [Mon, 9 Aug 2010 08:31:16 +0000 (10:31 +0200)]
Fix scrollbar randomly popping up in QPlainTextEdit

When a line break was detected, we would retain the value of the
right bearing for the character after the break instead of resetting it
to the right bearing of the previous value. This could in some cases
cause the bounding rect of the text to be wrong, and could cause
unnecessary horizontal scrollbars to pop up. It was especially visible
when using WrapAnywhere. Visible e.g. in the compile output in Creator.

Done-by: mae
Reviewed-by: Eskil
Reviewed-by: Lars
(cherry picked from commit c5fa9eb1cb02d979502e2c9918d752c6708fb406)

8 years agoFix QTextEngine overflow caused by extremely long text
Jiang Jiang [Thu, 5 Aug 2010 09:21:03 +0000 (11:21 +0200)]
Fix QTextEngine overflow caused by extremely long text

Internally, QTextEngine use int to calculate most of the layout data
required. If a string longer than 2^24 is passed into either QTextEngine
or classes using it (QStackTextEngine, QPainter, QFontMetrics, etc.),
overflow will happen because the memory size required to allocate for
layout will become too large for int to handle. This patch will prevent
these cases and add error handling mechanism for relevant code.

Task-number: QT-3658
Reviewed-by: Eskil Abrahamsen Blomfeldt
(cherry picked from commit 05bb249c2ad3ee15eb205a806f8546c105683096)

8 years agoFix RightBearing confusion in text layout
mae [Fri, 16 Jul 2010 09:42:16 +0000 (11:42 +0200)]
Fix RightBearing confusion in text layout

Negative RightBearing was wrongly taken into
account when calculating the line wrap

Reviewed-by: Eskil Abrahamsen Blomfeldt
(cherry picked from commit 975b1913e44128a3e9b9055f9bf2ff40d86adf2a)

8 years agoUpdated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813
Simon Hausmann [Tue, 10 Aug 2010 14:18:22 +0000 (16:18 +0200)]
Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813

Integrated changes:

|| <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled ||
(cherry picked from commit 87b7587f25928272900900a106f360a4fbb4d6cd)

8 years agoFixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750
Jerome Pasion [Mon, 9 Aug 2010 08:14:27 +0000 (10:14 +0200)]
Fixed missing link tag in declarativeui.qdoc. Fix for QTBUG-12750
(cherry picked from commit ac355872573c7131e4b783cabe00c5656dc668af)

8 years agoqdoc: Cleaned up the application option specification and use.
Martin Smith [Thu, 5 Aug 2010 09:51:23 +0000 (11:51 +0200)]
qdoc: Cleaned up the application option specification and use.

The flags allowed on the command line are now:
-online (default), -base, -assistant (same as -base),
and -creator. If you don't specify one of these, you
see a warning in the error output telling you that it
didn't find an application flag and that it generated
online docs by defualt.
(cherry picked from commit d4dceca5dcd9252e09a421b65b318a7178049cd1)

8 years agoMade changes to qdoc to allow it to accept a "style level" flag
Jerome Pasion [Tue, 3 Aug 2010 07:49:14 +0000 (09:49 +0200)]
Made changes to qdoc to allow it to accept a "style level" flag
(cherry picked from commit a53b98f9269e6ee0b524fe7477e8fb46f189f9d3)

8 years agoqdoc: Removed three unused config variables.
Martin Smith [Thu, 5 Aug 2010 10:09:01 +0000 (12:09 +0200)]
qdoc: Removed three unused config variables.

These no longer do anything in qdocconf files:

online                  = false
offline                 = false
creator                 = true
(cherry picked from commit 7de8a0c487ce6a7f13c2028e93648807ef7d8e8b)

8 years agoI18N: Update German translations for 4.7.0.
Friedemann Kleint [Mon, 9 Aug 2010 07:17:27 +0000 (09:17 +0200)]
I18N: Update German translations for 4.7.0.
(cherry picked from commit 7ee7f19502bfd9193c624045bed07bdfdb23d1df)

8 years agoI18n: Complete German translation for 4.7.0
Friedemann Kleint [Wed, 7 Jul 2010 08:27:38 +0000 (10:27 +0200)]
I18n: Complete German translation for 4.7.0

8 years agoFix regression with SSL connections failing on symbian
Shane Kearns [Tue, 10 Aug 2010 13:02:52 +0000 (14:02 +0100)]
Fix regression with SSL connections failing on symbian

Due to a wrong ifdef sequence, the unix code was being compiled instead
of the symbian code for retrieving the system certificates.

Task-number: QTBUG-12718
Reviewed-by: Peter Hartmann
(cherry picked from commit 8229eded4cba85ae53c1b03ce87981ebabd2f3ae)

8 years agoQSslSocket: fix security vulnerability with wildcard IP addresses
Peter Hartmann [Tue, 10 Aug 2010 11:59:57 +0000 (13:59 +0200)]
QSslSocket: fix security vulnerability with wildcard IP addresses

This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.

Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704
(cherry picked from commit 846f1b44eea4bb34d080d055badb40a4a13d369e)

8 years agoDon't double-add item change listeners.
Michael Brasser [Tue, 10 Aug 2010 01:50:49 +0000 (11:50 +1000)]
Don't double-add item change listeners.

When a Repeater was used as the child of an Item binding to childrenRect,
the item change listener was being added twice for the items created
by the Repeater.

Task-number: QTBUG-12722
(cherry picked from commit 6feb5b75ce96aeeefee189af003949db8c031519)

8 years agoDoc: Adding content to installation guide and fixing printing bugs
Morten Engvoldsen [Tue, 3 Aug 2010 08:54:31 +0000 (10:54 +0200)]
Doc: Adding content to installation guide and fixing printing bugs
(cherry picked from commit 79797d175c41198b0dffad1dced021a07c5873ae)

8 years agoDoc: Correcting bugs in the CSS
Morten Engvoldsen [Tue, 3 Aug 2010 07:24:54 +0000 (09:24 +0200)]
Doc: Correcting bugs in the CSS
(cherry picked from commit 56cfbce20f736caa1ef74b5706fe3713ebd773c9)

8 years agoCherry-picked from: commit 47ba8dba3fe48d317974acd55afeea8a434c95f8
Jesper Thomschutz [Tue, 10 Aug 2010 12:45:03 +0000 (14:45 +0200)]
Cherry-picked from: commit 47ba8dba3fe48d317974acd55afeea8a434c95f8
Had to manually copy the file from that commit since the conflict was so wonky to resolve.
Original Author is: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date:   Fri Jul 9 21:36:15 2010 +0200

    Doc: Cleaning style and adding support for Creator
    Note: Support for creator has been disabled. HTML-generator needs an update.

8 years agoDoc: Correcting img bug
Morten Engvoldsen [Thu, 8 Jul 2010 12:55:17 +0000 (14:55 +0200)]
Doc: Correcting img bug

Task-number: QTBUG-12028
(cherry picked from commit 0b8a7842975b195a17b3add4c98f64baeaedcf8c)

8 years agoDoc: fixing style from 600 to bold weight
Morten Engvoldsen [Thu, 8 Jul 2010 11:15:47 +0000 (13:15 +0200)]
Doc: fixing style from 600 to bold weight
(cherry picked from commit ea7aeec080c9c39449017ff683b27d3659236336)

8 years agodoc: Re-introduced next/previous page links in the footer.
Martin Smith [Fri, 6 Aug 2010 12:30:42 +0000 (14:30 +0200)]
doc: Re-introduced next/previous page links in the footer.

Task-Nr:    QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)

8 years agodoc: Fixed some qdoc errors.
Martin Smith [Fri, 6 Aug 2010 11:12:25 +0000 (13:12 +0200)]
doc: Fixed some qdoc errors.
(cherry picked from commit fc4e9d15d4b85ade770cf92c10258a556fafa698)

8 years agodoc: Fixed some qdoc errors.
Martin Smith [Fri, 6 Aug 2010 10:31:48 +0000 (12:31 +0200)]
doc: Fixed some qdoc errors.
(cherry picked from commit 30d6f7ed29a2a5723387768cfe82a807a2724b8b)

8 years agodoc: Fixed some S60 qdoc errors.
Martin Smith [Fri, 6 Aug 2010 10:18:00 +0000 (12:18 +0200)]
doc: Fixed some S60 qdoc errors.
(cherry picked from commit fb6aa3b0769c33685ad38a13fe5ad0ca48679a93)

8 years agoTranslation work for 4.7
Pierre Rossi [Tue, 13 Jul 2010 09:22:38 +0000 (11:22 +0200)]
Translation work for 4.7

validating and adding some french translations.
Plus all the fixes from Gabriel's extensive review.
Doc: Fix a typo

Reviewed-by: gabi
(cherry picked from commit 209c017333fea9827fd20c7f8d23721bd8a6ee43)

8 years agoSome more french translations.
qCaro [Thu, 1 Jul 2010 12:50:18 +0000 (14:50 +0200)]
Some more french translations.

Reviewed-by: Pierre
(cherry picked from commit 4fd04190ab3800fde261293acd4bcf11cf449dee)

8 years agoSome french translations
Pierre Rossi [Wed, 30 Jun 2010 19:47:37 +0000 (21:47 +0200)]
Some french translations

Reviewed-by: gabi
(cherry picked from commit 065cc163d7848131dcfd8bb210c8590b6cd11991)

8 years agoRevert "fix compilation with -plugin-kbd-*"
Toby Tomkins [Sun, 8 Aug 2010 13:50:10 +0000 (23:50 +1000)]
Revert "fix compilation with -plugin-kbd-*"

This reverts commit 815ae300c9feb1930a338e8ab49589b14c57d0de.

8 years agoFix broken example code
Bea Lam [Fri, 6 Aug 2010 06:32:19 +0000 (16:32 +1000)]
Fix broken example code

Task-number: QTBUG-12705
(cherry picked from commit 59e3430662cfdc3820115a2ff4c0b44829b3d1d4)

8 years agoFix index page
Bea Lam [Fri, 6 Aug 2010 02:11:36 +0000 (12:11 +1000)]
Fix index page

Task-number: QTBUG-12703
(cherry picked from commit 97f64280e37f29bdeb92d6de55fac56b1ff37084)

8 years agoTop-level QML item should not have special focus handling.
Michael Brasser [Fri, 6 Aug 2010 03:39:10 +0000 (13:39 +1000)]
Top-level QML item should not have special focus handling.

It's the scene itself that acts as a focus scope, not the top-level

Task-number: QTBUG-12682
Reviewed-by: Aaron Kennedy
(cherry picked from commit 94b1c07c31ab84d30b198cb23291a48f98164827)

8 years agoImprove docs on QML Animation page and associated elements
Bea Lam [Thu, 5 Aug 2010 06:01:56 +0000 (16:01 +1000)]
Improve docs on QML Animation page and associated elements

Task-number: QTBUG-12666
(cherry picked from commit a9aaaf30b6c542b5c9e3c1e1681088ab26a530c0)

8 years agoRename example component file for clarity
Bea Lam [Thu, 5 Aug 2010 06:27:56 +0000 (16:27 +1000)]
Rename example component file for clarity

Task-number: QTBUG-12633
(cherry picked from commit dc2f700a006d827db0eaf8d1e01e4d9c7c8c0baa)

8 years agofix compilation with -plugin-kbd-*
Oswald Buddenhagen [Tue, 3 Aug 2010 19:03:35 +0000 (21:03 +0200)]
fix compilation with -plugin-kbd-*

it certainly is not such a good idea to write mouse when one means kbd

Task-number: QTBUG-12483
(cherry picked from commit 9f6bcd7ff39462ec2028ddbe27fc04911b856018)

8 years agoFix warning from whining complier.
Martin Jones [Thu, 5 Aug 2010 05:10:02 +0000 (15:10 +1000)]
Fix warning from whining complier.

Task-number: QTBUG-12473
Reviewed-by: Aaron Kennedy
(cherry picked from commit 1ca575eaf7c166f823b82132110ea066be819540)

8 years agoModified descriptions of QBasicTimer class and isActive() function.
Jerome Pasion [Fri, 6 Aug 2010 15:07:51 +0000 (17:07 +0200)]
Modified descriptions of QBasicTimer class and isActive() function.
Reviewed by: David Boddie
Task:    QTBUG-12313
(cherry picked from commit ab3ce23e3b5e28389b9f6f9bd5bc69cd42fcae5d)

8 years agodoc: Re-introduced next/previous page links in the footer.
Martin Smith [Fri, 6 Aug 2010 12:30:42 +0000 (14:30 +0200)]
doc: Re-introduced next/previous page links in the footer.

Task-Nr:    QTBUG-12278
(cherry picked from commit 2118f407b02654e9e3c6706647e8b9b711e8982b)

8 years agoAdding a description for the Spectrum Analyzer demo. For QTBUG-12180
Jerome Pasion [Thu, 5 Aug 2010 15:24:31 +0000 (17:24 +0200)]
Adding a description for the Spectrum Analyzer demo. For QTBUG-12180
Reviewed by: David Boddie
(cherry picked from commit 4bc408c6faade543c76fa0c7b8841ce72c239688)

8 years agoIncrease maximum heap size of QML Viewer
Joona Petrell [Wed, 4 Aug 2010 01:42:48 +0000 (11:42 +1000)]
Increase maximum heap size of QML Viewer

Task-number: QTBUG-12029
Reviewed-by: Martin Jones
(cherry picked from commit 4692a507dcdfbc830a0885016b6bd0bab4480bad)

8 years agoRemoved duplicate case for const variable snippet.
Jerome Pasion [Fri, 6 Aug 2010 11:32:29 +0000 (13:32 +0200)]
Removed duplicate case for const variable snippet.
Reviewer: David Boddie
Task number: QTBUG-10411
(cherry picked from commit 1f32f4013ab9178e8434bff847013a84491fe516)

8 years agodoc: Fixed some missing images.
Martin Smith [Fri, 6 Aug 2010 09:52:41 +0000 (11:52 +0200)]
doc: Fixed some missing images.

Task-nr: QTBUG-8246
(cherry picked from commit a273f6fb0b2410da772e7759125f955da9a5e19c)

8 years agoUpdate def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Aaron McCarthy [Fri, 6 Aug 2010 00:55:23 +0000 (10:55 +1000)]
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
(cherry picked from commit bbd444559359df3e211fedb28d40b175af778030)

8 years agoFix link error when building Bearer application with Qt Mobility
Alex [Thu, 5 Aug 2010 07:43:52 +0000 (17:43 +1000)]
Fix link error when building Bearer application with Qt Mobility
QtMobility uses the Qt header when compiling applications which
link against Mobility's Bearer library. Therefore
QNetworkConfiguration::bearerName() cannot be inline and refer to the
new QNetworkConfiguration::bearerTypeName() function (which doesn't
exist in Mobility)

Task-number: QTBUG-12378
Reviewed-by: Rohan McGovern
(cherry picked from commit d524da81ee257a6bd67d32d0bc870280a7d5b8a4)

8 years agoUpdated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245
Simon Hausmann [Thu, 5 Aug 2010 13:32:56 +0000 (15:32 +0200)]
Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245

|| <https://webkit.org/b/43530> || [Qt] Input mode states are not reset after entering a password field ||
(cherry picked from commit 13a0378151a5dc67d1dca91dffac573d051c37f8)

8 years agoFix deadlocks in ICD and NetworkManager engines.
Aaron McCarthy [Mon, 2 Aug 2010 23:56:13 +0000 (09:56 +1000)]
Fix deadlocks in ICD and NetworkManager engines.

Ensure that locks are not held when signals are emitted.

Task-number: QTBUG-12631
(cherry picked from commit b0a33937851f56a1830141e519fd6ba21481e6c9)

8 years agoAdd missing snippet file
Bea Lam [Wed, 4 Aug 2010 01:07:12 +0000 (11:07 +1000)]
Add missing snippet file

Task-number: QTBUG-12628
(cherry picked from commit c3bddbe29918951bd0d4220f62443add2a1fe938)

8 years agoDon't crash if an item is removed from the scene while it is gaining focus.
Martin Jones [Wed, 4 Aug 2010 02:45:10 +0000 (12:45 +1000)]
Don't crash if an item is removed from the scene while it is gaining focus.
If the item is removed from the scene in response to the FocusOut event
of the previous item don't continue attempting to set focus.

Task-number: QTBUG-12620
Reviewed-by: Michael Brasser
(cherry picked from commit 7f2c9d716cba375ee3e576513898a39b3f2c39a5)

8 years agoFixed crash in concentric circles example
Gunnar Sletta [Wed, 4 Aug 2010 17:38:41 +0000 (19:38 +0200)]
Fixed crash in concentric circles example

The problem is that the qt_arcs... function will return point_count = 0
when the input rectangle is empty which it is in this case. Because we
previously passed 13 there, were passing random memory to downwards in
the pipeline, which caused problems.

Task: http://bugreports.qt.nokia.com/browse/QTBUG-12516
Reviewed-by: mariusso
(cherry picked from commit 08d09a78d3faf8b211e78cb63285c35c5544b5fc)

8 years agoMake SpringAnimation usable inside a transition
mae [Wed, 4 Aug 2010 07:27:34 +0000 (09:27 +0200)]
Make SpringAnimation usable inside a transition

SpringFollow was turned into SpringAnimation so it could be
used inside a Behavior. This patch completes the work and makes
it usable inside a transition.

This is the documented behavior of SpringAnimation, the patch
is essential to make SpringAnimation work consistently.

Reviewed-by: Michael Brasser
Task-number: QTBUG-12141
(cherry picked from commit 33203efb786de9aebc6e05d1b4878d89e86ac456)

8 years agoFix crash when all visible items inluding currentIndex have been removed.
Martin Jones [Thu, 5 Aug 2010 02:09:25 +0000 (12:09 +1000)]
Fix crash when all visible items inluding currentIndex have been removed.

Task-number: QTBUG-11251
Reviewed-by: Bea Lam
(cherry picked from commit 7de5f19f0f62f181132394da6d7b2c8484cd42d9)

8 years agoFixed the curve descriptions and added descriptions for overshoot, amplitude, and...
Jerome Pasion [Wed, 4 Aug 2010 09:05:53 +0000 (11:05 +0200)]
Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940.
(cherry picked from commit 11f8bbaff73811c8d3342600bc7c77f47c34c7de)

8 years agoFixed incorrect include/Qt/qconfig.h in binary packages.
Rohan McGovern [Thu, 5 Aug 2010 06:04:56 +0000 (16:04 +1000)]
Fixed incorrect include/Qt/qconfig.h in binary packages.

When building from a source package, src/corelib/global/qconfig.h exists.
syncqt contained logic to force the creation of include/Qt/qconfig.h for
the case where it _doesn't_ exist.

This meant that running syncqt from a Qt source package resulted in
include/Qt/qconfig.h including qconfig.h twice.

Task: QTBUG-12637
Reviewed-by: Toby Tomkins
(cherry picked from commit 29d77e6003d0e156e5979dc8eb72e7ed8eb51456)

8 years agoUpdate def files.
Aaron McCarthy [Tue, 3 Aug 2010 01:09:37 +0000 (11:09 +1000)]
Update def files.
(cherry picked from commit ed6d7222894a9bdc804d8c64845e2f0f356d2c01)

8 years agoFix crash when setting font decorations on text drawn with QStaticText
Eskil Abrahamsen Blomfeldt [Mon, 2 Aug 2010 07:36:00 +0000 (09:36 +0200)]
Fix crash when setting font decorations on text drawn with QStaticText

Qt has a run-time assert for implementing drawPolygon() in any subclass
of QPaintEngine, which will be hit if set font decorations on the font
used by QStaticText. Since we don't care about line decorations or any
other shapes drawn in the QTextLayout, we simply leave the
implementation empty.

Reviewed-by: Gunnar
(cherry picked from commit 43f37074391b338b250883dfeb4a16844ca759fd)

8 years agoFix last character being overwritten in password field
Shane Kearns [Tue, 13 Jul 2010 11:04:36 +0000 (13:04 +0200)]
Fix last character being overwritten in password field

The temporary cursor position was not being updated after committing the
input (changing the cleartext into a *), as a result of which, the next
keypress was mistaken for a multitap input which should replace the last

Task-number: QTBUG-11673
Reviewed-by: axis
(cherry picked from commit 7acf2417bd2ae17c2e3c289c7caed84219e5fecd)

8 years agoFix the remote command delimiter, this has cahnged at some point.
kh1 [Wed, 4 Aug 2010 14:02:44 +0000 (16:02 +0200)]
Fix the remote command delimiter, this has cahnged at some point.

Task-number: QTBUG-12485 QTBUG-12651
Reviewed-by: ck
(cherry picked from commit 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f)

8 years agoModified qtdemo so error does not appear when there is no demo/example description...
Kevin Wright [Mon, 2 Aug 2010 15:43:42 +0000 (17:43 +0200)]
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
(cherry picked from commit e55fd8c9790863f2d6001bda617a9d87be61f29b)

8 years agoMerge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0
Toby Tomkins [Thu, 5 Aug 2010 00:16:43 +0000 (10:16 +1000)]
Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0