qt:qt.git
11 years agoFix loop count in animanted gifs sometimes being incorrect
Simon Hausmann [Mon, 24 Jan 2011 12:06:29 +0000 (13:06 +0100)]
Fix loop count in animanted gifs sometimes being incorrect

Applied patch supplied in QT-4426, which also completes
https://bugs.webkit.org/show_bug.cgi?id=36818

Task-number: QT-4426
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 22:23:08 +0000 (08:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Validate arguments to QDBusConnection::connect

11 years agoValidate arguments to QDBusConnection::connect
Thiago Macieira [Fri, 14 Jan 2011 12:29:02 +0000 (13:29 +0100)]
Validate arguments to QDBusConnection::connect

This fixes a crash caused by user code trying to connect to object
paths that aren't valid (if we send this to the bus daemon, we get an
error with the AddMatch call).

Reviewed-by: Trust Me
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 16:59:19 +0000 (02:59 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  make the test a bit stricter
  ignore the warning from auto-detach in destructor
  get rid of extra calls to handle()
  simplify QSharedMemory::detach()
  avoid extra calculations
  fix error reporting on detach()
  fix error reporting
  Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.

11 years agomake the test a bit stricter
Ritt Konstantin [Fri, 21 Jan 2011 15:29:10 +0000 (15:29 +0000)]
make the test a bit stricter

don't say we passed the test if we didn't

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoignore the warning from auto-detach in destructor
Ritt Konstantin [Fri, 21 Jan 2011 15:29:05 +0000 (15:29 +0000)]
ignore the warning from auto-detach in destructor

we locked shm few line ago and didn't unlock it, so we expecting for this warning

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoget rid of extra calls to handle()
Ritt Konstantin [Fri, 21 Jan 2011 15:29:01 +0000 (15:29 +0000)]
get rid of extra calls to handle()

in create(), handle() is called a few lines early;
in attach(), QSharedMemory::attach() calls handle() as a preparation step;
in detach(), well, if we're here, unix_key is valid anyways...

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agosimplify QSharedMemory::detach()
Ritt Konstantin [Fri, 21 Jan 2011 15:28:57 +0000 (15:28 +0000)]
simplify QSharedMemory::detach()

de-init members in the QSharedMemoryPrivate::detach() like in code for symbian.
this gains a lightly better control in case of errors on detach()

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoavoid extra calculations
Ritt Konstantin [Fri, 21 Jan 2011 15:28:53 +0000 (15:28 +0000)]
avoid extra calculations

QSystemSemaphore::setKey() sets the fileName member to makeKeyFileName()'s result;
no need to call it again

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agofix error reporting on detach()
Ritt Konstantin [Fri, 21 Jan 2011 15:28:49 +0000 (15:28 +0000)]
fix error reporting on detach()

before, we returned too early :)

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agofix error reporting
Ritt Konstantin [Fri, 21 Jan 2011 15:28:44 +0000 (15:28 +0000)]
fix error reporting

that was mistakenly broken by 570e7b38487455d394b5b74a59edc639f3dc416f

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoMake QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
Miikka Heikkinen [Fri, 21 Jan 2011 14:29:27 +0000 (16:29 +0200)]
Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.

Reviewed-by: axis
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 13:13:57 +0000 (23:13 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix to pen state handling in OpenVG paint engine.

11 years agoFix to pen state handling in OpenVG paint engine.
Jani Hautakangas [Fri, 21 Jan 2011 12:37:46 +0000 (13:37 +0100)]
Fix to pen state handling in OpenVG paint engine.

Shape should not be filled using pen if pen brush
type is NoBrush. OpenVG paint engine didn't check
NoBrush case when applying pen.

Task-number: QTBUG-15870
Reviewed-by: Gunnar
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 08:47:34 +0000 (18:47 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  BorderImage fails for .sci source containing a URL
  positionViewAtIndex can fail when positioned near end of list.

11 years agoBorderImage fails for .sci source containing a URL
Martin Jones [Fri, 21 Jan 2011 05:38:15 +0000 (15:38 +1000)]
BorderImage fails for .sci source containing a URL

Task-number: QTBUG-16769
Reviewed-by: Bea Lam
11 years agopositionViewAtIndex can fail when positioned near end of list.
Martin Jones [Fri, 21 Jan 2011 05:03:35 +0000 (15:03 +1000)]
positionViewAtIndex can fail when positioned near end of list.

We positioned the view beyond the bounds, which in some cases resulted
in only one item being created.  Combined with a bug in the bounds
fixup very many items were created.

Task-number: QT-4441
Reviewed-by: Michael Brasser
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 02:05:39 +0000 (12:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Revert "Fix loaded() signal to be emitted only once"

11 years agoRevert "Fix loaded() signal to be emitted only once"
Bea Lam [Fri, 21 Jan 2011 01:39:28 +0000 (11:39 +1000)]
Revert "Fix loaded() signal to be emitted only once"

This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.

QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.

Task-number: QTBUG-16796

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 20 Jan 2011 17:53:05 +0000 (03:53 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Revert "don't include harfbuzz where we don't use it"
  don't accidentaly enable egl when disabling openvg
  be more consistent about CFG_EGL_GLES_INCLUDES interpretation
  fix build with -opengl es1 in some cases
  don't include harfbuzz where we don't use it
  don't assign MANIFEST_DIR if we don't need it

11 years agoRevert "don't include harfbuzz where we don't use it"
Oswald Buddenhagen [Thu, 20 Jan 2011 17:26:43 +0000 (18:26 +0100)]
Revert "don't include harfbuzz where we don't use it"

harfbuzz is indirectly included via qharfbuzz_p.h, which is included by
qtextengine_p.h, which in turn is included by qfontengine_p.h and
qpaintbuffer_p.h.

This reverts commit 6551a2933126cc86ac4c1e5265e967100d240fb0.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 20 Jan 2011 16:02:11 +0000 (02:02 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  don't accidentaly enable egl when disabling openvg
  be more consistent about CFG_EGL_GLES_INCLUDES interpretation
  fix build with -opengl es1 in some cases
  don't include harfbuzz where we don't use it
  don't assign MANIFEST_DIR if we don't need it

11 years agodon't accidentaly enable egl when disabling openvg
Ritt Konstantin [Thu, 20 Jan 2011 15:21:40 +0000 (16:21 +0100)]
don't accidentaly enable egl when disabling openvg

Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
11 years agobe more consistent about CFG_EGL_GLES_INCLUDES interpretation
Ritt Konstantin [Thu, 20 Jan 2011 15:02:42 +0000 (16:02 +0100)]
be more consistent about CFG_EGL_GLES_INCLUDES interpretation

!"no" != "yes"; use the same condition in both places

Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
11 years agofix build with -opengl es1 in some cases
Ritt Konstantin [Thu, 20 Jan 2011 11:08:41 +0000 (12:08 +0100)]
fix build with -opengl es1 in some cases

try <GLES/egl.h> first, and if that fails, try <EGL/egl.h>. if
CFG_EGL_GLES_INCLUDES is "no", then QT_GLES_EGL is not defined and
type re-definitions in GLES/egltypes.h and EGL/egl.h might occur later.

Merge-request: 1027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
11 years agodon't include harfbuzz where we don't use it
Ritt Konstantin [Thu, 20 Jan 2011 11:07:14 +0000 (12:07 +0100)]
don't include harfbuzz where we don't use it

this only added extra noise to the output...

Merge-request: 1028
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
11 years agodon't assign MANIFEST_DIR if we don't need it
Oswald Buddenhagen [Wed, 19 Jan 2011 14:35:55 +0000 (15:35 +0100)]
don't assign MANIFEST_DIR if we don't need it

avoids warnings with qmake -Wall about overriding the variable (as
typically both scripts are in CONFIG, but only one is actually used).

Task-number: QTBUG-13911
Reviewed-by: mariusSO
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 20 Jan 2011 12:39:25 +0000 (22:39 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Improved QMAKE_POST_LINK support in symbian-sbsv2

11 years agoImproved QMAKE_POST_LINK support in symbian-sbsv2
Miikka Heikkinen [Thu, 20 Jan 2011 11:58:58 +0000 (13:58 +0200)]
Improved QMAKE_POST_LINK support in symbian-sbsv2

QMAKE_POST_LINK value handling now uses the same automatic replacements
as QMAKE_EXTRA_COMPILERS and QMAKE_EXTRA_TARGETS handling.
In practice this means that it is now possible to use $$QMAKE_COPY and
friends in QMAKE_POST_LINK value also with symbian-sbsv2 mkspec, and
that any backslashes in the value are assumed to be path separators and
will be converted to forward slashes.

Task-number: QTBUG-16753
Reviewed-by: Janne Koskinen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 20 Jan 2011 00:03:40 +0000 (10:03 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Switch default Phonon backend on Symbian from Helix to MMF
  Do not load aplication fonts on Symbian^1 and below
  Fix compilation error.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 19 Jan 2011 20:36:04 +0000 (06:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use SRCDIR as a base path for the test data.
  Add the test data to the INSTALLS target

11 years agoSwitch default Phonon backend on Symbian from Helix to MMF
Gareth Stockwell [Wed, 19 Jan 2011 18:31:38 +0000 (18:31 +0000)]
Switch default Phonon backend on Symbian from Helix to MMF

If both plugins are present on a device, the MMF backend is now
loaded by default.

Task-number: QT-4472
Reviewed-by: Justin McPherson
11 years agoDo not load aplication fonts on Symbian^1 and below
Alessandro Portale [Wed, 19 Jan 2011 17:49:34 +0000 (18:49 +0100)]
Do not load aplication fonts on Symbian^1 and below

read http://bugreports.qt.nokia.com/browse/QTBUG-16514 for
a recipy to reboot the phone just by handling with fonts.

Symbian^1 is vulnerable, and Symbain^3 prevents a phone reboot.
Therefore, I prefer to disable the app font feature for
Symbian^1, until QTBUG-16514 us properly handled.

Task-Number: QTBUG-16514

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 19 Jan 2011 17:18:03 +0000 (03:18 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Cleanup created views in TextEdit tests.
  TextEdit implicit size varied depending upon wrapMode.

11 years agoFix compilation error.
Jason McDonald [Wed, 19 Jan 2011 14:39:44 +0000 (00:39 +1000)]
Fix compilation error.

Protect #include of feature-specific header in #ifdef.

Task-number: QTBUG-16652
Reviewed-by: Trust Me
Acked-by: Jani Hautakangas
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 19 Jan 2011 13:40:12 +0000 (23:40 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Supporting Qt application fonts on Symbian

11 years agoSupporting Qt application fonts on Symbian
Alessandro Portale [Wed, 19 Jan 2011 12:16:13 +0000 (13:16 +0100)]
Supporting Qt application fonts on Symbian

This patch finally implements the missing application font support on
Symbian. QFontDatabase's addApplicationFont[FromData],
applicationFontFamilies and removeApplicationFont are now functional and
allow an application to load, use and unload fonts at run-time.

The underlying Symbian API comes with some restrictions/specialties.
Most of them are worked around in this patch, the missing ones are left
as part of QTBUG-16514:

- The font file must be a file, not a memory buffer. Web fonts and qrc
fonts come as memory buffers. These buffers are saved to a temporary
.ttf file and the file is loaded by the underlying Symbian API. The
temporary file can only be deleted after the font is unloaded.

- The font file must be in a public location in order to be loadable by
Symbian. It can for example not reside in the private application
directory. Therefore, all application fonts (also those that are on the
file system) become a temporary .ttf file in c:\temp\.

- Symbian3/PR2 will come with a font table API which provides direct
access to font tables. Symbian3/PR1 and below are missing this API,
therefore, an own TFontStore is (ab)used to read font tables out of a
font. This patch is considering both code paths in several occasions,
making the Qt Symbian font implementation significantly less
maintainable.

- The fonts are loaded into Symbian's central font server. Loaded fonts
from different processes can have colliding font typeface names (not
file names) on that server. The server does not separate loaded fonts by
their origin processes. Working around such collisions is part of
QTBUG-16514.

The number of fonts loadable at the same time by a Qt application is
limited to the random value 5. Just to prevent abuse of the font
server's memory.

As usual, this patch was looked at by colleagues, and it was adjusted
according to the feedback. But since the bus factor for the
interaction of Qt's and Symbian's font systems is 1, I reviewed this
patch, myself.

Task-Number: QTBUG-6611
Autotest: tst_QFontDatabase::addAppFont

11 years agoUse SRCDIR as a base path for the test data.
Lucian Varlan [Tue, 4 Jan 2011 13:49:39 +0000 (15:49 +0200)]
Use SRCDIR as a base path for the test data.

The test cannot run on harmattan CI system, which executes it from
a different directory than the one where the executable resides.

Reviewed-by: Adrian Constantin
Reviewed-by: Harald Fernengel
11 years agoAdd the test data to the INSTALLS target
Adrian Constantin [Wed, 5 Jan 2011 12:31:10 +0000 (14:31 +0200)]
Add the test data to the INSTALLS target

Reviewed-by: Lucian Varlan
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 19 Jan 2011 10:11:30 +0000 (20:11 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  fix doubleformat config.test
  stabilize qmake autotest

11 years agofix doubleformat config.test
Ritt Konstantin [Wed, 19 Jan 2011 09:10:14 +0000 (10:10 +0100)]
fix doubleformat config.test

add 0.0 at the end to be treated like trailing null (\0)
by some versions of 'strings' cli tool

Merge-request: 2550
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoCleanup created views in TextEdit tests.
Martin Jones [Wed, 19 Jan 2011 01:27:48 +0000 (11:27 +1000)]
Cleanup created views in TextEdit tests.

Reviewed-by: Michael Brasser
11 years agoTextEdit implicit size varied depending upon wrapMode.
Martin Jones [Wed, 19 Jan 2011 01:25:22 +0000 (11:25 +1000)]
TextEdit implicit size varied depending upon wrapMode.

We failed to reset textWidth before calculating the ideal width of
the text.

Task-number: QTBUG-16710
Reviewed-by: Michael Brasser
11 years agostabilize qmake autotest
Ritt Konstantin [Tue, 18 Jan 2011 17:20:35 +0000 (18:20 +0100)]
stabilize qmake autotest

on a systems with small packet windows, QProcess::readAllStandardError()
might return a part of the string and the existing code
adds an endl to it a bit later, causing a test failure.
(I don't care about the '\r'-s here because of QString shall eat them anyways)

Merge-request: 2546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 21:06:39 +0000 (07:06 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Revert "Add a warning about trying to release a timer ID that isn't active"
  Some unit tests for layout explosion thingy
  Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
  Build failure fix (related to QT-4079)
  QWidgets support for VGA screen

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 17:23:22 +0000 (03:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Generate createpackage calls with absolute path.
  Added detection of bat files to the qtPrepareTool function.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 16:01:27 +0000 (02:01 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Revert "Add a warning about trying to release a timer ID that isn't active"
  Some unit tests for layout explosion thingy
  Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
  Build failure fix (related to QT-4079)
  QWidgets support for VGA screen

11 years agoGenerate createpackage calls with absolute path.
Miikka Heikkinen [Tue, 18 Jan 2011 14:37:02 +0000 (16:37 +0200)]
Generate createpackage calls with absolute path.

This ensures that the correct version of the script is always called.

Task-number: QTBUG-16687
Reviewed-by: axis
11 years agoAdded detection of bat files to the qtPrepareTool function.
axis [Tue, 5 Oct 2010 11:36:49 +0000 (13:36 +0200)]
Added detection of bat files to the qtPrepareTool function.

Not all tools end with .exe. Some also end in .bat.

RevBy:    Oswald Buddenhagen

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 12:29:11 +0000 (22:29 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix to data detaching in OpenVG pixmap data
  Remove toolcheck from generic clean targets for symbian-sbsv2

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 10:47:45 +0000 (20:47 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Revert "Add a warning about trying to release a timer ID that isn't active"
  Some unit tests for layout explosion thingy
  Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
  Build failure fix (related to QT-4079)
  QWidgets support for VGA screen

11 years agoFix to data detaching in OpenVG pixmap data
Jani Hautakangas [Tue, 18 Jan 2011 08:59:34 +0000 (10:59 +0200)]
Fix to data detaching in OpenVG pixmap data

QImage::converToFormat(format) won't detach QImage if
format stays the same. Because of this, internal QImage
buffer of QVGPixmapData was not deep copied. Drawing
to QPixmap target modified the original QImage that was
used to create QPixmap and in some cases crashed because
paint engine referred to wrong target.

Task-number: QT-4407
Reviewed-by: Jason Barron
11 years agoRemove toolcheck from generic clean targets for symbian-sbsv2
Miikka Heikkinen [Tue, 18 Jan 2011 09:44:29 +0000 (11:44 +0200)]
Remove toolcheck from generic clean targets for symbian-sbsv2

Toolcheck can cause generic clean fail (i.e. "make clean" or
"make debug-clean") for e.g. environments where Carbide command
line tools have not been installed, because sbsv2 toolchain does a
check for all tools related to target platforms, even though they are
not needed for actual cleaning.

Task-number: QTBUG-16691
Reviewed-by: Janne Koskinen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 07:28:41 +0000 (17:28 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Request font sizes with only 0.5pt resolution.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 04:14:37 +0000 (14:14 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  tst_qhttp: replace legacy qt-test-server hostname in testdata.

11 years agotst_qhttp: replace legacy qt-test-server hostname in testdata.
Rohan McGovern [Tue, 18 Jan 2011 01:38:55 +0000 (11:38 +1000)]
tst_qhttp: replace legacy qt-test-server hostname in testdata.

11 years agoRequest font sizes with only 0.5pt resolution.
Martin Jones [Tue, 18 Jan 2011 00:59:34 +0000 (10:59 +1000)]
Request font sizes with only 0.5pt resolution.

When animating pointSize avoid generating a huge number of fonts with
slightly different point sizes.

Task-number: QTBUG-13960
Reviewed-by: Aaron Kennedy
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 18 Jan 2011 00:48:47 +0000 (10:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert "Add a warning about trying to release a timer ID that isn't active"

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 21:33:30 +0000 (07:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Revert "Add a warning about trying to release a timer ID that isn't active"
  Some unit tests for layout explosion thingy
  Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
  Build failure fix (related to QT-4079)
  QWidgets support for VGA screen

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 18:05:26 +0000 (04:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Make qvfb compile (and work) with libpng 1.5
  Updates to Galician localization
  don't misdetect powermac host systems when determining target arch
  Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian
  make sure Option::dir_sep is initialized in time
  don't ignore return code from syncqt
  make qtlibinfix apply to QT_INSTALL_TRANSLATIONS
  clean up platform detection logic
  accept -declarative-debug under unix
  Fix static build on Windows with MinGW.
  fix -enable-stdcall-fixup usage
  don't claim declarative debugging support without having declarative
  installation of translations is now dealt with by translations.pro
  German translation fixes
  fix typo in error messages

11 years agoMerge branch '4.7-review' into 4.7-staging
Thierry Bastian [Mon, 17 Jan 2011 15:58:27 +0000 (16:58 +0100)]
Merge branch '4.7-review' into 4.7-staging

11 years agoMake qvfb compile (and work) with libpng 1.5
Bernhard Rosenkraenzer [Mon, 17 Jan 2011 15:32:39 +0000 (16:32 +0100)]
Make qvfb compile (and work) with libpng 1.5

In libpng >= 1.5.0, the png_info struct is no longer exported

Merge-request: 1023
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoRevert "Add a warning about trying to release a timer ID that isn't active"
Olivier Goffart [Mon, 17 Jan 2011 15:32:03 +0000 (16:32 +0100)]
Revert "Add a warning about trying to release a timer ID that isn't active"

This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2.

Revert it in Qt 4.7 because the warning is triggered a lot by Qt itself
They are going to be fixed in master.

Reviewed-by: Thierry
Task-number: QTBUG-16175

11 years agoUpdates to Galician localization
marce villarino [Mon, 17 Jan 2011 14:44:44 +0000 (15:44 +0100)]
Updates to Galician localization

Merge-request: 1024
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 14:25:36 +0000 (00:25 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix one character displacement for cursor in line edits
  Fix header not found build error
  QTBUG-16110 updating the softkeys when app comes to foreground
  Workaround crash when multiple QNetworkAccessManager instances are used

11 years agodon't misdetect powermac host systems when determining target arch
Konstantin Tokarev [Mon, 17 Jan 2011 14:14:56 +0000 (15:14 +0100)]
don't misdetect powermac host systems when determining target arch

Task-number: QTBUG-6150
Merge-request: 2549
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoFix one character displacement for cursor in line edits
Miikka Heikkinen [Mon, 17 Jan 2011 13:44:44 +0000 (15:44 +0200)]
Fix one character displacement for cursor in line edits

The variable m_inlinePosition was not updated when m_preeditString
was cleared in QCoeFepInputContext. This resulted in cursor displaying
up one character beyond where it logically should have been when
using HW Qwerty keyboard on E7 and similar devices.

Task-number: QTBUG-16238
Reviewed-by: axis
11 years agoImplementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian
Jeremy Katz [Mon, 17 Jan 2011 13:37:17 +0000 (14:37 +0100)]
Implementation of QNetworkProxyFactory::systemProxyForQuery() for Symbian

This implementation replaces the default do-nothing version, querying
the device's commsdat for appropriate entries.

Task-number: QTBUG-13857
Reviewed by: Jeremy Katz et al.

11 years agoFix header not found build error
Shane Kearns [Mon, 17 Jan 2011 12:44:06 +0000 (12:44 +0000)]
Fix header not found build error

Task-Number: QT-4378

11 years agomake sure Option::dir_sep is initialized in time
Oswald Buddenhagen [Thu, 13 Jan 2011 18:53:39 +0000 (19:53 +0100)]
make sure Option::dir_sep is initialized in time

querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may
happen before querying any os scopes, so better make it initialize the
host mode explicitly.
loading features theoretically needs an initialized dir_sep as well (to
detect relative paths), so take care of that as well.

Task-number: QTBUG-10633
Reviewed-by: mariusSO
11 years agodon't ignore return code from syncqt
Oswald Buddenhagen [Tue, 11 Jan 2011 12:46:36 +0000 (13:46 +0100)]
don't ignore return code from syncqt

Task-number: QTBUG-16176
Reviewed-by: mariusSO
11 years agomake qtlibinfix apply to QT_INSTALL_TRANSLATIONS
Oswald Buddenhagen [Tue, 11 Jan 2011 12:28:40 +0000 (13:28 +0100)]
make qtlibinfix apply to QT_INSTALL_TRANSLATIONS

the unix configure already got it right

Task-number: QTBUG-15978
Reviewed-by: Alessandro Portale
Reviewed-by: mariusSO
11 years agoclean up platform detection logic
Oswald Buddenhagen [Tue, 11 Jan 2011 11:43:35 +0000 (12:43 +0100)]
clean up platform detection logic

it's pointless to check which files are present, as we only have
all-platform packages now.

Task-number: QTBUG-15685
Reviewed-by: mariusSO
11 years agoaccept -declarative-debug under unix
Oswald Buddenhagen [Mon, 10 Jan 2011 19:41:48 +0000 (20:41 +0100)]
accept -declarative-debug under unix

Task-number: QTBUG-15626
Reviewed-by: mariusSO
11 years agoFix static build on Windows with MinGW.
Mark Brand [Mon, 10 Jan 2011 19:21:05 +0000 (20:21 +0100)]
Fix static build on Windows with MinGW.

Q_DECL_IMPORT is still __declspec(dllimport), which is unsuitable for
static code.

Commit edbc656b changed Q_DECL_IMPORT_IMPORT to Q_CORE_EXPORT when
declaring QtCore functions in svg.

Now we change Q_DECL_IMPORT to Q_GUI_EXPORT when declaring QtGui
functions into opengl and openvg.

Also removed the redundant keyword "extern" from the function declarations.

Merge-request: 2540
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: mariusSO
11 years agofix -enable-stdcall-fixup usage
Oswald Buddenhagen [Mon, 10 Jan 2011 19:09:24 +0000 (20:09 +0100)]
fix -enable-stdcall-fixup usage

the leading "-Wl," was apparently accidentally split off to the wrong
line.

Task-number: QTBUG-15391
Reviewed-by: mariusSO
11 years agodon't claim declarative debugging support without having declarative
Oswald Buddenhagen [Mon, 10 Jan 2011 18:58:49 +0000 (19:58 +0100)]
don't claim declarative debugging support without having declarative

Task-number: QTBUG-15228
Reviewed-by: mariusSO
11 years agoinstallation of translations is now dealt with by translations.pro
Oswald Buddenhagen [Tue, 11 Jan 2011 14:14:31 +0000 (15:14 +0100)]
installation of translations is now dealt with by translations.pro

Reviewed-by: mariusSO
11 years agoGerman translation fixes
Frederik Schwarzer [Wed, 12 Jan 2011 12:42:59 +0000 (13:42 +0100)]
German translation fixes

- some entity mismatches (apos -> quot)
- Boolesch -> boolesch
- Hangul is translated Hangeul
- schlug fehl -> ist fehlgeschlagen
- unify: next; previous -> nächte[sr]; vorherige[sr]
- unify: Encoding -> Kodierung
... and some various fixes more.

Merge-request: 2535
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agofix typo in error messages
Oswald Buddenhagen [Wed, 12 Jan 2011 15:09:03 +0000 (16:09 +0100)]
fix typo in error messages

Task-number: QTBUG-16369

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 11:09:33 +0000 (21:09 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix double click event on Mac OS X.

11 years agoQTBUG-16110 updating the softkeys when app comes to foreground
mread [Mon, 17 Jan 2011 10:52:14 +0000 (10:52 +0000)]
QTBUG-16110 updating the softkeys when app comes to foreground

When an app is in the background and creates a window with softkeys,
the softkeys are not updated when the app comes to the foreground, so
they look faded. This change updates the softkeys when the app comes
to the forground.

Task-number: QTBUG-16110
Reviewed-by: Jason Barron
11 years agoFix double click event on Mac OS X.
Fabien Freling [Thu, 9 Dec 2010 12:55:32 +0000 (13:55 +0100)]
Fix double click event on Mac OS X.

Fix an issue where the double click would be
triggered even with different mouse buttons.

Task-number: QTBUG-8222
Reviewed-by: Richard Moe Gustavsen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 07:22:32 +0000 (17:22 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Autotest for QVariant value types
  Fix memory leak
  Clarify Component.createObject(null) behavior.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 06:53:35 +0000 (16:53 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Workaround crash when multiple QNetworkAccessManager instances are used

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 17 Jan 2011 03:20:55 +0000 (13:20 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  fixed CI gate flagged spelling error: occured -> occurred
  file rename
  various fixes to deal with CI gate failures
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

11 years agofixed CI gate flagged spelling error: occured -> occurred
Jeremy Katz [Sun, 16 Jan 2011 18:14:54 +0000 (19:14 +0100)]
fixed CI gate flagged spelling error: occured -> occurred

11 years agoWorkaround crash when multiple QNetworkAccessManager instances are used
Shane Kearns [Wed, 5 Jan 2011 11:07:56 +0000 (11:07 +0000)]
Workaround crash when multiple QNetworkAccessManager instances are used

Instead of each QNetworkAccessManager owning a QNetworkSession, they now
share a QNetworkSession if they have the same QNetworkConfiguration.
QNetworkAccessManager now uses passive roaming instead of application
level roaming. The state change signal (entering connected state) is used
to indicate reconnection instead of being triggered when sending an ALR
accept().
This preserves the previous behaviour, as QNAM always accepted the
suggested access point from bearer mobility.
In the case of multithreaded applications, one QNetworkSession will be
created for each thread which uses QNetworkAccessManager, as QNetworkSession
is not thread safe.

Task-number: QT-4378
Reviewed-by: Markus Goetz
Reviewed-by: juhvu
11 years agofile rename
Jeremy Katz [Fri, 14 Jan 2011 13:46:54 +0000 (14:46 +0100)]
file rename

11 years agovarious fixes to deal with CI gate failures
Jeremy Katz [Fri, 14 Jan 2011 13:23:56 +0000 (14:23 +0100)]
various fixes to deal with CI gate failures

11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 14 Jan 2011 12:49:03 +0000 (22:49 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Revert "Add a warning about trying to release a timer ID that isn't active"

11 years agoRevert "Add a warning about trying to release a timer ID that isn't active"
Jan-Arve Sæther [Fri, 14 Jan 2011 12:38:02 +0000 (13:38 +0100)]
Revert "Add a warning about trying to release a timer ID that isn't active"

This reverts commit e1955231478df8990cf8b1f80438abf957c5d6f2.
In a patch release this is the best way of fixing the problem of
warnings.
This will be fixed properly in 4.8

Reviewed-by: Gabriel
Task-number: QTBUG-16175

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 14 Jan 2011 10:05:51 +0000 (20:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 14 Jan 2011 06:41:43 +0000 (16:41 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Autotest for QVariant value types
  Fix memory leak
  Clarify Component.createObject(null) behavior.

11 years agoAutotest for QVariant value types
Aaron Kennedy [Fri, 14 Jan 2011 06:14:17 +0000 (16:14 +1000)]
Autotest for QVariant value types

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 14 Jan 2011 03:08:43 +0000 (13:08 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Proper fix for QGraphicsItem crash.

11 years agoFix memory leak
Aaron Kennedy [Fri, 14 Jan 2011 00:57:21 +0000 (10:57 +1000)]
Fix memory leak

Task-number: QTBUG-16526

11 years agoClarify Component.createObject(null) behavior.
Martin Jones [Fri, 14 Jan 2011 00:51:53 +0000 (10:51 +1000)]
Clarify Component.createObject(null) behavior.

Setting the parent of the returned item does not affect its object
ownership so care must be taken to ensure it is not garbage collected.

Task-number: QTBUG-16630
Reviewed-by: Aaron Kennedy
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 13 Jan 2011 23:58:51 +0000 (09:58 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 13 Jan 2011 20:35:20 +0000 (06:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix QSharedMemory and QSystemSemaphore autotests for Symbian
  Fix QSystemSemaphore handle management issues in Symbian