Created by Philip Muškovac and last modified
Get this branch:
bzr branch lp:~neon/qt/4.8

Branch merges

Related bugs

Related blueprints

Branch information

Deprecated Projected Neon

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/qt/qt.git,branch=4.8.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on neumayer and finished taking 1 minute — see the log
Import started on pear and finished taking 40 seconds — see the log
Import started on pear and finished taking 40 seconds — see the log
Import started on neumayer and finished taking 1 minute — see the log

Recent revisions

4311. By Orgad Shaneh <email address hidden>

Update Hebrew translation for linguist and qtconfig

Change-Id: Ic19596ddc1da75a11c7a52dc07266e05b43643c8
Reviewed-by: Orgad Shaneh <email address hidden>
Reviewed-by: Genghis Khan <email address hidden>

4310. By Morten Johan Sørvig <email address hidden>

Info.plist.lib whitespace fixup

Change-Id: I2fed6342004218f4173c0ef72130b710d1a0f0c8
Reviewed-by: Jake Petroules <email address hidden>

4309. By Timur Pocheptsov <email address hidden>

QGLWidget and re-parenting

On OS X we have QWidgetPrivate::glWidgets list to track all child gl-widgets
and this propagates though all the widget's tree, starting from QGLWidget and up to the
top-level window ('isWindow'). It can happen, that some of widgets in a chain is becoming
a window (but still has a parent) - this results in QGLWidget's destructor failing to remove
'this' from one of ancestors (since it stops on the first 'isWindow' ancestor).
Modify QWidgetPrivate::setParent_sys that it does NOT add glWidgets into the parent's
glWidgets, if this widget isWindow itself.

Change-Id: I4bf4a927a4e43537355fdcdef465638c91e9f956
Task-number: QTBUG-20652
Reviewed-by: Gabriel de Dietrich <email address hidden>

4308. By Friedemann Kleint <email address hidden>

Fix compiler warnings in Qt Designer.

shared/widgetdatabase.cpp:371:66: warning: typedef 'NameItemMap' locally defined but not used [-Wunused-local-typedefs]
tools/designer/src/lib/shared/previewmanager.cpp:820:16: warning: converting ‘false’ to pointer type ‘QWidget*’ [-Wconversion-null]

Task-number: QTBUG-44747
Change-Id: I9781a8cbce1def5229fe0ed7071c04ae6880b039
Reviewed-by: Oliver Wolff <email address hidden>

4307. By Laszlo Agocs <email address hidden>

Simplify mirroring code and add tests for non-aliged 1 bit images

Like it is done in Qt 5. Also add the autotest which was completely
missing in Qt 4.

Change-Id: Iaf89272b4e5b7f377c4b2f1ce929661f3d0edd9a
Reviewed-by: Lars Knoll <email address hidden>

4306. By Andy Shaw <email address hidden>

Fix Carbon build

Change-Id: Iae9445d1777ffced3d998e3f9a0a57117fa8d192
Reviewed-by: Morten Johan Sørvig <email address hidden>

4305. By Richard Moore

Fix a division by zero when processing malformed BMP files.

This fixes a division by 0 when processing a maliciously crafted BMP
file. No impact beyond DoS.

Backport of 661f6bfd032dacc62841037732816a583640e187

Task-number: QTBUG-44547
Change-Id: I43f06e752b11cb50669101460902a82b885ae618
Reviewed-by: Thiago Macieira <email address hidden>

4304. By Michael Brüning <email address hidden>

Correct typo in the Gujarati openType identififer.

Based on testing by Paresh Adhia.

Task-number: QTBUG-44568
Change-Id: I11c9e304282ca5afbdb02a37c366a331a4f24b04
Reviewed-by: Konstantin Ritt <email address hidden>

4303. By Yikei Lu <email address hidden>

Fix Focus problem with QX11EmbedWidget

Since QX11EmbedWidget can be included in another Qt application which
has QX11EmbedContainer, QX11EmbedWidget should be activated at first.

Task-number: QTBUG-3617
Change-Id: I23e12f6c3ed9f7bd4a3ac0d0237bf7382db14ee2
Reviewed-by: Shawn Rutledge <email address hidden>

4302. By Pierre-Loup A. Griffais <email address hidden>

Don't leak RENDER Pictures in QPixmap::paintEngine().

Qt 5 doesn't use serverside pixmaps, so doesn't need this patch.

Change-Id: I5ad456679efd3706582dd1e6ca8e6b4404298739
Reviewed-by: Laszlo Agocs <email address hidden>
Reviewed-by: Shawn Rutledge <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.