qt:qt.git
5 years agoCorrect error in Makefile generation for Windows MinGW. v4.8.5
Michael Brüning [Wed, 5 Jun 2013 12:11:06 +0000 (14:11 +0200)]
Correct error in Makefile generation for Windows MinGW.

Remove the build_pass check that was added for vcproj
generation as it is no longer deemed necessary.

See http://trac.webkit.org/changeset/62264 and
http://trac.webkit.org/changeset/59266 for context.

Task-number: QTBUG-27413
Change-Id: Ie82032cf4b183b31c66defc2d49cc8095989ec8f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
5 years agoDon't overwrite QMAKE_QT_CONFIG with empty value
Jonathan Liu [Thu, 6 Jun 2013 02:42:13 +0000 (12:42 +1000)]
Don't overwrite QMAKE_QT_CONFIG with empty value

If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten
with an empty value from .qmake.cache. Avoid this by first checking
if the value from .qmake.cache is not empty before assigning it to
QMAKE_QT_CONFIG.

This was already addressed differently in Qt 5.

Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRemove Nokia references.
Leonard Lee [Tue, 4 Jun 2013 11:53:31 +0000 (13:53 +0200)]
Remove Nokia references.

These Nokia references removed as they are not appropriate.

Task-number: QTBUG-31400
Change-Id: Ib80d2c2d28353e74c46e9ead9cde9807dad7022d
(cherry-picked from qtdoc/019f96bc47cf56170c125ae90f5fc00059f6665d)
(cherry-picked from qtwebkit/d7b8c69ccdd5547b5660be5876dbdedc3ac29548)
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoRe-enable compilation of idc for MinGW
Kai Koehne [Tue, 4 Jun 2013 07:26:50 +0000 (09:26 +0200)]
Re-enable compilation of idc for MinGW

Re-enable compilation of idc for MinGW to fulfill the activeqt dependency
on idc.

idc and activeqt compile fine with MinGW, but most examples won't work
because of the missing midl compiler. This was the reason activeqt and idc
was disabled originally after Qt 4.8.4. Anyhow, 330ca76b then re-enabled
compilation for activeqt, but not idc, which broke the build. This patch
re-enables compilation of idc, but still by default does not compile
activeqt examples.

Qt 5 ships with activeqt / idc for MinGW too, btw, so excluding it in Qt
4.8.5 is inconsistent.

Task-number: QTBUG-31517
Change-Id: I7d4e7ed56c1954996b7291f56143ff83fcdcb0a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoMake sure idc links only against QtCore
Kai Koehne [Tue, 4 Jun 2013 10:43:16 +0000 (12:43 +0200)]
Make sure idc links only against QtCore

Do not link against QtGui (which might not have been compiled yet).

Task-number: QTBUG-22260
Change-Id: I42d926cc30a0bc278fc796f32652281c03f140d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDisable precision timers when running MSVC2012 code on pre-Windows 8.
Friedemann Kleint [Thu, 2 May 2013 15:04:08 +0000 (17:04 +0200)]
Disable precision timers when running MSVC2012 code on pre-Windows 8.

Precision timers can cause the event loop to lock up
when running MSVC2012 code on pre-Windows 8.

Task-number: QTBUG-27266

Change-Id: Idd73731e82843d0d140859bab825bc1a54eccf1a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from qtbase/aa1b4c0943187d82e0c313b93559e99226a9c75a)

5 years agoUpdate LICENSE.PREVIEW.COMMERCIAL license
Sergio Ahumada [Mon, 3 Jun 2013 11:42:23 +0000 (13:42 +0200)]
Update LICENSE.PREVIEW.COMMERCIAL license

Change-Id: I8af7630ec54e1a9d4b063e8278df5e75d2abf97e
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
5 years agoDoc: Fixed typo in QDialog.
Jerome Pasion [Mon, 3 Jun 2013 10:37:35 +0000 (12:37 +0200)]
Doc: Fixed typo in QDialog.

Task-number: QTBUG-31493

Change-Id: Ie112f601d629c794842d746e7b9c96849c74bdf6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoFix Qt WebKit build for non-default Xcode setup / Xcode 4.3+
Danny Boelens [Wed, 17 Apr 2013 13:18:37 +0000 (15:18 +0200)]
Fix Qt WebKit build for non-default Xcode setup / Xcode 4.3+

There's no need to test the full path, the actual name of the SDK will do.
This fixes the build in cases where Xcode is not installed in /Developer
or when building with Xcode 4.3 or higher (where Xcode is a bundle), because
in those cases the SDK's full path does not start with /Developer.

Change-Id: I598ba2a5ebaae813f576dc72102d05fe8804a86f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoTools: unnecessary to make qmlplugindump a bundle
Liang Qi [Mon, 27 May 2013 14:04:58 +0000 (16:04 +0200)]
Tools: unnecessary to make qmlplugindump a bundle

Embed Info.plist in qmlplugindump executable in a special way.

Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8
(adpated from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agopostgresql driver: escape backslashes only when server requires it
Mark Brand [Thu, 7 Mar 2013 10:52:52 +0000 (11:52 +0100)]
postgresql driver: escape backslashes only when server requires it

Task-number: QTBUG-30076

Change-Id: I408cda941884f01484d0edfa82c91fc19cb8718c
Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br>
Reviewed-by: Sergey Blagodarin
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Andras Mantia <andras@kdab.com>
(cherry picked from qtbase/e3c5351d06ce8a12f035cd0627356bc64d8c334a)
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoDoc: corrected LGPL Exception header
Nico Vertriest [Thu, 23 May 2013 12:05:58 +0000 (14:05 +0200)]
Doc: corrected LGPL Exception header

Task-number: QTBUG-31271

Change-Id: Ifdb36c4bc01f88f743f128e46272b5c9c20fde4e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agorebuild configure.exe
Oswald Buddenhagen [Fri, 24 May 2013 09:41:13 +0000 (11:41 +0200)]
rebuild configure.exe

583f6e1: Disabling largefile support for WinCE
2bba0ea: Avoid macro re-definition after 65bd0bd1f04
45a277c: Fix url about evaluation license
e80d7bb: unmess CONFIG/QT_CONFIG static/shared
e5735c9b: Update copyright year in Digia's license headers
f7e9417: fix -inotify option
e5e5238: add inotify command line switch
69b918f: Fix syntax error on configure.exe source code.
deca010: Use slogger2 for logging on Blackberry instead of writing to stderr

Change-Id: I5ed9540aa3841be05926669cdc40afd608f69a37
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix creating new QWS surface only when it does not exist already
Pasi Petäjäjärvi [Thu, 23 May 2013 07:46:48 +0000 (10:46 +0300)]
Fix creating new QWS surface only when it does not exist already

Calling createSurface(const QString &key, const QByteArray &data)
function is needed when starting/creating new server/client
application, and changes to region sizes (and memory allocation)
after that is handled by QWS surfaces themself inside
setGeometry(const QRect &rect) function.

Task-number: QTBUG-31254
Change-Id: I97c78ebe83b2aa9ab9e4ffc8a9987ab2528f8cf1
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoFix QLocale::standaloneMonthName when d->m_data == systemData()
El Mehdi Fekari [Thu, 2 May 2013 10:30:49 +0000 (12:30 +0200)]
Fix QLocale::standaloneMonthName when d->m_data == systemData()

At the moment if d->m_data == systemData() it calls
systemLocale()->query but forgets about the standalone part
so you get the wrong data

This patch introduces the new enums so that backends can implement
properly the standaloneMonthName feature properly. At the moment the Windows
and Mac ones still return the monthName, the Unix and Blackberry ones return
the data we store in months_data.

cherry picked from qtbase/b1de018e9a1efcd0f9e298ae4c865197feb47895

Change-Id: I1054420dc696ed2be0d52bdc6567ebaf202faf12
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoQNX: Enabled ALSA support
Bernd Weimer [Fri, 17 May 2013 09:05:09 +0000 (11:05 +0200)]
QNX: Enabled ALSA support

If ALSA version >=1.0.10 is available on QNX it will be used by QAudio
classes. In Qt5 this is enabled already.

Change-Id: Ia4e3952ee147eaf78be7cec3c8a9fcfc97da332c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
5 years agoConvert the new filename to native separators before checking it
Andy Shaw [Mon, 15 Apr 2013 11:18:11 +0000 (13:18 +0200)]
Convert the new filename to native separators before checking it

If a native separator was put in the new name when renaming a file name
via the file dialog then it would correctly fail. But if a non-native
one was used on Windows then it would cause the file to be moved
instead if the directory existed.

Change-Id: If01760b8c54a69b600c9a44c7509017be70d33e3
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
(cherry picked from qtbase/9ec493fa41d06a618d3983c02d9a1141d9d306df)

5 years agoRespect specified minimum height for menuBar also if it has HFW.
Jan Arve Saether [Tue, 14 May 2013 07:45:53 +0000 (09:45 +0200)]
Respect specified minimum height for menuBar also if it has HFW.

If the menu bar is subject to height for width (HFW) we should of
course respect that, but in addition we should ensure that the HFW is
within the minimum and maximum height. This also is consistent with how
QGridLayout calculates the effective minimum row height.

This fixes a regression because change 4780f94e391b5e881497c5228661dead
turned QTabWidget into a proper height-for-width citizen, and when
setting a QTabWidget as a menuwidget, the buggy codepath for HFW was
suddenly hit in menuBarHeightForWidth().

Task-number: QTBUG-31057

Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/27e690e163408dec1e9c56ffc07131354d4b2c8a)

Change-Id: I915d37c69152c1804925000303e82a3fae5a9a47
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoQGV: fix items not to be selected on right mouse button release
J-P Nurmi [Wed, 15 May 2013 12:31:47 +0000 (14:31 +0200)]
QGV: fix items not to be selected on right mouse button release

Task-number: QTBUG-30990
Change-Id: Iaf2dd7ed496625097daa05d5dc92ef5957574ee9
(Cherry-picked from qtbase/0b862e067756132225e33be09670631edd50d944)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
5 years agoPrevent crash due to giving QWidget::update() a large region.
Samuel Rødal [Fri, 26 Apr 2013 08:36:04 +0000 (10:36 +0200)]
Prevent crash due to giving QWidget::update() a large region.

Similar to what change a298216bb4383dbe96 does for update(QRect) we clip
the update region against the widget's rect and return if it's empty.
Otherwise we risk ending up with update rects that are larger than
INT_MAX due to multiple update rects being merged.

Task-number: QTBUG-30876
Change-Id: Idf695b1fdca50449a1e5ddf37500653de290590c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit 69ee30260a667b2b977a0d4b52abf6537521cce8)

5 years agoPrevent crash due to giving QWidget::update() a large rect.
Samuel Rødal [Fri, 26 Apr 2013 08:36:04 +0000 (10:36 +0200)]
Prevent crash due to giving QWidget::update() a large rect.

We can simply clip the update rect against the widget's rect and return
if it's empty. Otherwise we risk ending up with update rects that are
larger than INT_MAX due to multiple update rects being merged.

Task-number: QTBUG-30876
Change-Id: I23bd0149fbe8d1a007a60b228e6bddb45dc4fc32
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit a298216bb4383dbe96688dfb80da0cd875766de0)

5 years agotest: Mark tst_qinputdialog as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 12:53:39 +0000 (14:53 +0200)]
test: Mark tst_qinputdialog as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTBUG-31101
Change-Id: Iccb8169dc513df7c0c34cd15d21d11e59cb44f11
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agoWidgets: avoid integer divide by zero in QProgressDialog
Liang Qi [Wed, 15 May 2013 10:34:47 +0000 (12:34 +0200)]
Widgets: avoid integer divide by zero in QProgressDialog

Autotest is included.

Task-number: QTBUG-31046

Change-Id: Ief7d71b58e7a5416f3659f19445e5d729849b3b6
(cherry picked from commit 69c05bbef47fb9d30d70e594bd5942add8b135fe)
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
5 years agoBlackBerry: Revised error handling in event dispatcher
Bernd Weimer [Tue, 14 May 2013 12:28:41 +0000 (14:28 +0200)]
BlackBerry: Revised error handling in event dispatcher

Added an upper bound check for socket notifier file descriptors. Too
high FDs have been a real source of failure.
Added compiler hints to allow error-free code path run faster (errors
are highly unlikely) and adjusted warning messages (some were misleading
and too long).
Backported from qtbase: ebd5de1

Change-Id: Ib982f853ee803447bdcaf22aed310697a36b4ccf
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
5 years agoBackport qmlRegisterUncreatableType with version template
Alan Alpert [Fri, 3 May 2013 18:11:27 +0000 (11:11 -0700)]
Backport qmlRegisterUncreatableType with version template

Otherwise it is not possible to extend or add uncreatable types safely.

Change-Id: I22e81bb46a69efcec3522454d5ad465099b2555b
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
5 years agoDisabling largefile support for WinCE.
Bjoern Breitmeyer [Wed, 27 Jun 2012 08:40:39 +0000 (10:40 +0200)]
Disabling largefile support for WinCE.

This was disabled before, but
2bba0eadc1570f29331285738b9d319687f84d4c
enabled it per default.

Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06
(cherry picked from commit 45750b18187ef257a986cf6ab8b2c97ef3ba6e52)
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoqmake/vcxproj: resurrect support for /we compiler switch
Joerg Bornemann [Thu, 2 May 2013 15:43:17 +0000 (17:43 +0200)]
qmake/vcxproj: resurrect support for /we compiler switch

The vcxproj format supports the /we compiler switch as
TreatSpecificWarningsAsErrors tag.
Support for this switch got lost during refactoring of the
vc(x)proj generators for Qt 4.8.0.

Task-number: QTBUG-29098

Change-Id: I607e907dcb9c1bc7d261053b6d757941ec7db822
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit a3d1d41d1d88b989fe7c460ef32b4f8606aafe0c)

5 years agoqmake/vcxproj: fix parsing of /RTC* options
Joerg Bornemann [Thu, 2 May 2013 16:42:09 +0000 (18:42 +0200)]
qmake/vcxproj: fix parsing of /RTC* options

/RTCsu and /RTCus must be handled as full runtime check options.

Task-number: QTBUG-30711

Change-Id: I783bf49f2ab1d4fd9636dca8e434bccb54844c8c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 3c62f4d0c65f1a60bd8d4e6b985d79cb0aa8342b)

5 years agotest: Mark tst_qsharedpointer as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 09:44:20 +0000 (11:44 +0200)]
test: Mark tst_qsharedpointer as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTBUG-31100
Change-Id: I925accd0637250ba8e7a0173c51a2171b4e960b3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoSpecial-case the forward declaration of STL types for libc++.
Raphael Kubo da Costa [Fri, 10 May 2013 01:08:38 +0000 (04:08 +0300)]
Special-case the forward declaration of STL types for libc++.

This is somewhat of a follow-up to 5210d47aa66214e3cb16f394d0510a91f770c1b1.
libc++ declares the STL types in an inline namespace within the "std" one if
clang is used.

If one includes a header such as <iterator> before a Qt one and builds with
QT_NO_STL, the following ends up happening:

  // <iterator>
  namespace std {
      inline namespace __1 {
          struct random_access_iterator ... ;
      }
  }

  // qiterator.h
  #ifdef QT_NO_STL
  namespace std {
     struct random_access_iterator;
  }
  #endif

qiterator.h's declaration shadows the original one, and the compiler
complains random_access_iterator lacks an actual declaration.

Solve this by checking for libc++ and forward-declaring the iterator types
we need within the same inline namespace.

Not backported from qtbase because QT_NO_STL does not exist in Qt 5.

Change-Id: I6742d540f6538a30aa060a4447c288cfb9cd781d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agotest: Remove insignificant_test from tst_qaudioinput
Sergio Ahumada [Thu, 9 May 2013 16:20:25 +0000 (18:20 +0200)]
test: Remove insignificant_test from tst_qaudioinput

This test is now passing on all CI platforms.

Change-Id: I51df22c00d4e13a0b83230bc25e1b810ed183539
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qgraphicsscene as insignificant only on Embedded (QWS)
Sergio Ahumada [Thu, 9 May 2013 16:15:39 +0000 (18:15 +0200)]
test: Mark tst_qgraphicsscene as insignificant only on Embedded (QWS)

This test has been passing lately for Linux, Windows and Mac OS X.

Change-Id: I994fe4c69c3520fe1eabf2d92224c8dd040ba3d9
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qdbusmarshall
Sergio Ahumada [Thu, 9 May 2013 16:05:44 +0000 (18:05 +0200)]
test: Remove insignificant_test from tst_qdbusmarshall

This test is now passing on all CI platforms.

Change-Id: I19f1b4bd4969bf9e396d696a273d214af16ebd9a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qgraphicsanchorlayout
Sergio Ahumada [Thu, 9 May 2013 15:19:22 +0000 (17:19 +0200)]
test: Remove insignificant_test from tst_qgraphicsanchorlayout

This test is now passing on all CI platforms.

Change-Id: Idd094cdbc2a21f3e5840366f8f47b9a187331023
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qgraphicsanchorlayout1 as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 14:59:35 +0000 (16:59 +0200)]
test: Mark tst_qgraphicsanchorlayout1 as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: I6f21bf40d93adc8e359cf9fa0feea7fd4140736e
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qgraphicswidget as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 13:02:46 +0000 (15:02 +0200)]
test: Mark tst_qgraphicswidget as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: Ie658d90cbc9eb2b68a963b1f1de06ca37f44047e
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qinputcontext as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 12:58:20 +0000 (14:58 +0200)]
test: Mark tst_qinputcontext as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: Ib1d44ce284e3d0dcfa539376928cb41516a2059a
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qitemdelegate
Sergio Ahumada [Thu, 9 May 2013 12:45:36 +0000 (14:45 +0200)]
test: Remove insignificant_test from tst_qitemdelegate

This test is now passing on all CI platforms.

Change-Id: I06b659a750dcc76858287eb8336aa5228298d6e5
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qmacstyle
Sergio Ahumada [Thu, 9 May 2013 12:39:56 +0000 (14:39 +0200)]
test: Remove insignificant_test from tst_qmacstyle

This test is now passing on all CI platforms.

Change-Id: I421a7f541e24f1f1ebad8a68cc599bbdd38a767a
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qpainter as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 12:31:09 +0000 (14:31 +0200)]
test: Mark tst_qpainter as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: I7b92c105bfa4fc00c92a00d4d731cabc878bb073
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qscriptextensionplugin
Sergio Ahumada [Thu, 9 May 2013 11:41:21 +0000 (13:41 +0200)]
test: Remove insignificant_test from tst_qscriptextensionplugin

This test is now passing on all CI platforms.

Change-Id: Icd24090b782738c3ab2635d41560eaf0d6b7ba1a
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qsettings as insignificant only on Windows
Sergio Ahumada [Thu, 9 May 2013 10:08:05 +0000 (12:08 +0200)]
test: Mark tst_qsettings as insignificant only on Windows

This test has been passing lately for Linux and Mac.

Task-number: QTQAINFRA-574
Change-Id: I9dfc0c5b79a019e70fba04502050b35997384928
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qstylesheetstyle as insignificant only on Mac OS X
Sergio Ahumada [Thu, 9 May 2013 09:28:52 +0000 (11:28 +0200)]
test: Mark tst_qstylesheetstyle as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: I7a3001381df805c9424b694197a92b467d69c1bc
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agoFix jump and property changes on first move when dragging a Flickable.
Andrew den Exter [Tue, 12 Mar 2013 06:04:54 +0000 (16:04 +1000)]
Fix jump and property changes on first move when dragging a Flickable.

Fixes a regression whereby on the first mouse move the contentItem was
moved the total distance from the touch point to where the drag
distance was exceeded. For large drag thresholds this causes a
noticeable jump.

Task-number: QTBUG-30032

(cherry picked from qtquick1 3a80424aeae19e838be03aa12a5243911ec3f020)

Change-Id: I92c119d27dc2e22203484f9ada5978697d171957
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
5 years agoCheck that 3DNow! instructions are supported before including mm3dnow.h.
Raphael Kubo da Costa [Thu, 9 May 2013 22:40:23 +0000 (01:40 +0300)]
Check that 3DNow! instructions are supported before including mm3dnow.h.

Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
instruction headers: by checking that the compiler is set to support those
instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
only means the compiler supported them when the build was being configured).

This has not caused a problem in most cases so far because GCC protects its
mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
and can fail if -march is set to, for example, i386 or i486.

Not backported from qt5 because qtbase because qsimd_p.h does not include
the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.

Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUkrainian translation update
Victor Ostashevsky [Thu, 4 Apr 2013 15:34:49 +0000 (17:34 +0200)]
Ukrainian translation update

Tiny fixes, mostly about copyright years.

Change-Id: I9223eaabccb1ce93f1688f3512344dbcfb05aa6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix clang warning about bool to pointer conversion.
Jędrzej Nowacki [Thu, 17 Nov 2011 13:42:48 +0000 (14:42 +0100)]
Fix clang warning about bool to pointer conversion.

The operation is legal from C++ perspective but only for "false" as it
is guaranteed to be 0. Anyway returning 0 instead of "false" is
logical and it follows coding style used in the modified functions.

(cherry-picked from qt5 commit 50995e6936c5ca75a0a8a48c29bbbedd2cc60567)
Change-Id: Ia09758e8d28599097f5c40eb24722890508afdbc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agotest: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_member
Sergio Ahumada [Tue, 7 May 2013 21:51:20 +0000 (23:51 +0200)]
test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_member

This test is now passing on all CI platforms.

Change-Id: I526a92a2bd94fff03b58f63df0119db0d124ba18
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qtableview as insignificant only on Windows
Sergio Ahumada [Wed, 8 May 2013 09:02:05 +0000 (11:02 +0200)]
test: Mark tst_qtableview as insignificant only on Windows

This test has been passing lately for Linux and Mac.

Task-number: QTQAINFRA-574
Change-Id: I4e1a95d66596b29a926a92dae325fd2fbb114d81
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qtimeline
Sergio Ahumada [Wed, 8 May 2013 08:44:36 +0000 (10:44 +0200)]
test: Remove insignificant_test from tst_qtimeline

This test is now passing on all CI platforms.

Task-number: QTQAINFRA-574
Change-Id: I6a536c7c4c33817544bff1d933d6f4a05f1631c2
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_qwizard as insignificant on Windows and Mac OS X
Sergio Ahumada [Wed, 8 May 2013 08:32:50 +0000 (10:32 +0200)]
test: Mark tst_qwizard as insignificant on Windows and Mac OS X

This test has been passing lately on Linux.

Change-Id: I3c7e5cf4214899a65f4eccd15a0fd49e822675d8
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Mark tst_xmlpatterns as insignificant only on Windows
Sergio Ahumada [Wed, 8 May 2013 08:24:06 +0000 (10:24 +0200)]
test: Mark tst_xmlpatterns as insignificant only on Windows

This test has been passing lately for Linux and Mac.

Task-number: QTQAINFRA-574
Change-Id: I507a6b4220a3e3ded7bcfed2aded1e15bf53958a
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agotest: Remove insignificant_test from tst_qlocalsocket
Sergio Ahumada [Tue, 7 May 2013 22:35:24 +0000 (00:35 +0200)]
test: Remove insignificant_test from tst_qlocalsocket

This test is now passing on all CI platform

Change-Id: Ib16a0e1e914ae85271f751f66bdece7e4ec851b6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Mark tst_qsocketnotifier as insignificant only on Mac OS X
Sergio Ahumada [Tue, 7 May 2013 22:20:55 +0000 (00:20 +0200)]
test: Mark tst_qsocketnotifier as insignificant only on Mac OS X

This test has been passing lately for Linux and Windows.

Task-number: QTQAINFRA-574
Change-Id: Ic4d96c3645d6d10227ad1ce957f27a2079e9b834
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Remove insignificant_test from tst_qsocks5socketengine
Sergio Ahumada [Tue, 7 May 2013 22:16:10 +0000 (00:16 +0200)]
test: Remove insignificant_test from tst_qsocks5socketengine

This test is now passing on all CI platforms.

Change-Id: I0d669849e0b17f42e78c1864ea3ba9f070560093
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Mark tst_qtcpserver as insignificant only on Windows
Sergio Ahumada [Tue, 7 May 2013 22:10:19 +0000 (00:10 +0200)]
test: Mark tst_qtcpserver as insignificant only on Windows

This test has been passing lately for Linux and Mac.

Task-number: QTQAINFRA-574
Change-Id: I5c4cbea784af6e879ccd6a02aaf77f9debad594f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Remove useless insignificant_test mark tst_qudpsocket
Sergio Ahumada [Tue, 7 May 2013 22:00:31 +0000 (00:00 +0200)]
test: Remove useless insignificant_test mark tst_qudpsocket

The mark is actually in qudpsocket/test/test.pro

Change-Id: I4b4d9843b5643e15d988ceabfb9abca4f8cf77a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_static
Sergio Ahumada [Tue, 7 May 2013 21:54:53 +0000 (23:54 +0200)]
test: Remove insignificant_test from tst_qsslsocket_onDemandCertificates_static

This test is now passing on all CI platforms.

Change-Id: Ia3f4e9dd863e04758e1c794f29142e4417d044d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Remove useless insignificant_test mark
Sergio Ahumada [Tue, 7 May 2013 21:24:13 +0000 (23:24 +0200)]
test: Remove useless insignificant_test mark

The mark is actually in qnetworkreply/test/test.pro

Change-Id: I391c3863b6a98f485b8e6b585f346bf06820999e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Remove insignificant_test from tst_qhttpnetworkconnection
Sergio Ahumada [Tue, 7 May 2013 21:20:18 +0000 (23:20 +0200)]
test: Remove insignificant_test from tst_qhttpnetworkconnection

This test is now passing on all CI platforms.

Task-number: QTQAINFRA-574
Change-Id: I8a08beef2f9876d88b7b903cda445ec5decce706
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agotest: Mark tst_qnetworksession as insignificant only on Windows
Sergio Ahumada [Tue, 7 May 2013 21:04:29 +0000 (23:04 +0200)]
test: Mark tst_qnetworksession as insignificant only on Windows

This test has been passing lately for Linux and Mac.

Task-number: QTQAINFRA-574
Change-Id: I6ed79e9bf166a17226b3196a90b47a3fd48912b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
5 years agoCompile in C++11 mode: narrowing conversion problems
Thiago Macieira [Fri, 20 Jan 2012 18:46:06 +0000 (16:46 -0200)]
Compile in C++11 mode: narrowing conversion problems

Matches qtbase commit a13b17e42a7ca146ec9503285df546d4ade22c91
Change-Id: Ie554499f40c03c715d527f2c1624b97fafe5ce8c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoMake QContiguousCache with zero capacity not crash
Thiago Macieira [Tue, 25 Sep 2012 14:30:48 +0000 (16:30 +0200)]
Make QContiguousCache with zero capacity not crash

These containers don't make sense and will just result in no action
being taken (all items added will simply be discarded), but it
shouldn't crash due to a division by zero.

Task-number: QTBUG-27339
Change-Id: Ib9acf5c0a9a826e6853e7beaf5e56511fde98dc6
(cherry-picked from qt5 commit 320c4e31e124f99601399d00935362b587c77510)
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoDon't bypass overwritten [set]data() methods in the proxy.
Volker Krause [Sat, 4 May 2013 16:26:25 +0000 (18:26 +0200)]
Don't bypass overwritten [set]data() methods in the proxy.

By calling itemData() of the source model directly, the result cannot
contain data provided by the proxy model itself. The base class
implementation however will call data() on the proxy instead.

Cherry-picked from qtbase/96e3c2bcbfedc8b5cb8fc099229a02a1fa335c21.

Change-Id: I7e8b65ab045382089c577d9832edc1555b71419e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoMake Qt 4.8 also compile with the LSB SDK on Linux
Thiago Macieira [Sun, 5 May 2013 21:24:13 +0000 (14:24 -0700)]
Make Qt 4.8 also compile with the LSB SDK on Linux

Generate worse code.

This is similar to Qt5 commits 46bfd84fdc24fa3e3e721a5dda6cfbebe75be073
and c69106d1bf66d64e046c4f639542457151187dfc.

Task-number: QTBUG-25336
Change-Id: Idd61c23d2b528db9d8c7895df008b9c1b0e2a2a4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix QtScript crash on 64bit with JIT.
Friedemann Kleint [Mon, 28 Jan 2013 14:15:34 +0000 (15:15 +0100)]
Fix QtScript crash on 64bit with JIT.

During back-trace generation we calculate a code offset towards JIT generated
code. Using JITCode::offsetOf() will crash/assert if the offset doesn't fit
into 32 bits, because the generated code can only encode relative offsets
in 32-bits and not 64-bits. However in this context - backtrace generation -
we just want to calculate the offset and are not interested in this
architectural limitation, therefore we can just calculate the offset ourselves
using the fully sized uintptr_t.

Initial-patch-by: Simon.Hausmann@digia.com
Task-number: QTCREATORBUG-8629
Task-number: QTBUG-23463

Change-Id: I0efadd5ed20855409122e1fcc9236fdfbc4f62a4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
(cherry picked from qtscript/3b26f6f6643978c9d041a6267dc88e2a59ced763)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoQLocale: Add fr_MA locale
El Mehdi Fekari [Thu, 2 May 2013 14:04:09 +0000 (16:04 +0200)]
QLocale: Add fr_MA locale

French_Morocco locale was introduced in CLDRv22.1 and already exists in Qt5

Change-Id: I4f0452f421cf074eb2c4fae22351d430d5f02e42
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agomake sure qmake finds itself in CWD on windows
Oswald Buddenhagen [Thu, 25 Apr 2013 14:44:30 +0000 (16:44 +0200)]
make sure qmake finds itself in CWD on windows

and consequently that it finds qt.conf.

Task-number: QTBUG-30583
Change-Id: I48441477e941d9609270d6e5e1b405127c0c0aca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/e7c3b21b7c1ed9247cb2f9eeddc154534a038549)

5 years agoBring in WebKit r74029 to fix the build with clang.
Raphael Kubo da Costa [Sun, 28 Apr 2013 18:58:04 +0000 (21:58 +0300)]
Bring in WebKit r74029 to fix the build with clang.

------------------------------------------------------------------------
r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines

Reviewed by Eric Seidel.

Clang fails to build the JSC interpreter
https://bugs.webkit.org/show_bug.cgi?id=51016

Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows
them, but it does not correctly generate the cleanup, causing a leak if the
cleanup decrements a reference count.

* interpreter/Interpreter.cpp:
(JSC::Interpreter::privateExecute): Put an Identifier into its own scope.
------------------------------------------------------------------------

Cherry-picked from qtscript/c85662167123b433a69a662212c67ce03e44a25a.

Change-Id: I21ee882961264d131cebdee04cb641c0d0de3d18
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoFixed -dbus-linked when cross-compiling from Windows
Matt Fischer [Thu, 28 Feb 2013 16:52:12 +0000 (10:52 -0600)]
Fixed -dbus-linked when cross-compiling from Windows

Since Windows doesn't have pkg-config, it doesn't get -ldbus-1
added to the command line automatically like Linux does.  Code
was present to deal with this case, however it was only configured
to work when native-compiling Qt.  The flag was not added when
cross-compiling, meaning that -dbus-linked did not work correctly
in that case.  This patch changes the code to add the flag properly
in both cases.

Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9
Task-number: QTBUG-29984
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix QPluginLoader-test.
Friedemann Kleint [Mon, 1 Oct 2012 08:04:15 +0000 (10:04 +0200)]
Fix QPluginLoader-test.

Set correct working directory on Windows, do not create app-bundle
on Mac. Changing numbering of garbage libraries to 1..5.
use test data and and check for 'real' error message as well
as plugin cache message.

Set a fixed target for the test plugin, omitting debug suffixes
on Mac and Windows.

Change-Id: Ia2bf826d117ec346915de4cb24b16f8b6d61d579
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
5 years agoRevert "JSCore build fix for WEC7"
Janne Anttila [Wed, 24 Apr 2013 09:08:59 +0000 (11:08 +0200)]
Revert "JSCore build fix for WEC7"

I's reverted, because there seems to be at least two
implementations of the stl in WEC7. One for each BSP SDK
and one shipped with the compiler, which is in this
case Visual Studio 2008. The Compiler has a stl with std::min
etc. Visual Studio GUI also uses the compiler version of
the stl first. It seems to be that the environment was
setup wrongly. Checksdk also uses the right order.

The same patch is reverted for Qt5 as well:
https://codereview.qt-project.org/25482

This reverts commit 1fba05343eb6fea40f6617a62e31e10a0e918ec2

Change-Id: I956cc6f0669c67a094a2af464f8aa719a137a7a5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
5 years agoQNonContiguousByteDevice: reset() instead of seek() if possible
Peter Hartmann [Wed, 20 Mar 2013 10:40:30 +0000 (11:40 +0100)]
QNonContiguousByteDevice: reset() instead of seek() if possible

... because e.g. QHttpMultiPartIODevice does not implement seek at all
(QTBUG-30295), which would make resetting such a device fail.

(cherry picked from commit 804a067846cd90e3ca31f985d539c8d75d654d82)

Change-Id: I8ba1ef76cc6e7f5ebf0b39c9a75e3aea26980b82
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoQHttpMultipart: reset read pointer when device is reset
Peter Hartmann [Wed, 20 Mar 2013 10:27:08 +0000 (11:27 +0100)]
QHttpMultipart: reset read pointer when device is reset

... otherwise we would not read from the beginning when trying to
read again. The device is reset when we try to resend a request
(e.g. remote host closed etc.).

(cherry picked from commit 795468bdc68931a90454bd1c975f7de7ba670e3b)

Change-Id: I8d7b3afb64b9cd25ee7c13b78f0b470d9dae3021
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoFix some warnings in qtquick1 found by Clang
Thiago Macieira [Sat, 22 Dec 2012 08:33:21 +0000 (00:33 -0800)]
Fix some warnings in qtquick1 found by Clang

qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess]
qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value]
util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member]

Cherry-picked from qtquick1/99f138ad08101315cc871489c78cd10755b046b0

Change-Id: If0a690eacf9421f932214d2917cd3fa0a7daac9a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
5 years agoFix Mac OS X Carbon build with Qt in a namespace.
Danny Boelens [Thu, 21 Feb 2013 15:07:08 +0000 (16:07 +0100)]
Fix Mac OS X Carbon build with Qt in a namespace.

Change-Id: I03a4fa4ab7517929c723483deaf1dcb42a8f9b17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoqmlplugindump: add an explicit -relocatable flag
Fawzi Mohamed [Tue, 23 Apr 2013 17:09:22 +0000 (19:09 +0200)]
qmlplugindump: add an explicit -relocatable flag

* explicit -relocatable will allows us to change the default to
  nonrelocatable.
* add support for both -notrelocatable and the grammatically correct
  -nonrelocatable.
* backport from qt5

Change-Id: I0f5335e2cf86ba2eda7ad80b4f7271b8b6ddcada
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoFixed QLayout::addChildLayout(QLayout *l) when l had a parent
Jan Arve Saether [Tue, 23 Apr 2013 13:04:26 +0000 (15:04 +0200)]
Fixed QLayout::addChildLayout(QLayout *l) when l had a parent

Previously if l had a parent, addChildLayout would warn and skip the
reparenting, but it would still add the sub layout to the layout.
This caused some inconsistencies in the hierarchy which in worst case
could cause crashes.

Task-number: QTBUG-30758
(cherry-picked from qtbase commit 146658a10f290603470b800d71b778239e764312)
Change-Id: Iee6ace3189620395d7670007a23783823ed616b9
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoFixed potential invalid memory access in OpenGL engine glyph cache.
Samuel Rødal [Mon, 22 Apr 2013 07:05:52 +0000 (09:05 +0200)]
Fixed potential invalid memory access in OpenGL engine glyph cache.

We need to clamp glyph_height to prevent from overflowing the texture
cache. A slightly similar issue was fixed for glyph_width in change
9520674b0f02aac55da6. Also, we should only increment the y_offset in
the place where we check for an overflow.

Task-number: QTBUG-26649

Change-Id: I297191b2ffd68a636bfced7f5284fd3b9383e988
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoqsql_odbc: fix SQLGetStmtAtt usage
Mark Brand [Tue, 23 Apr 2013 20:46:43 +0000 (22:46 +0200)]
qsql_odbc: fix SQLGetStmtAtt usage

Failure to initialize the variable can cause spurious non-zero
values.

http://msdn.microsoft.com/en-us/library/windows/desktop/ms715438(v=vs.85).aspx

"..value can either be a SQLULEN value or a null-terminated character
string. If the value is a SQLULEN value, some drivers may only write the
lower 32-bit or 16-bit of a buffer and leave the higher-order
bit unchanged. Therefore, applications should use a buffer of SQLULEN
and initialize the value to 0 before calling this function. Also, the
BufferLength and StringLengthPtr arguments are not used."

Follow-up to 1509316a37fb2d365230d020d1dfc251c830fd56

Change-Id: I2e92eb845a2590bea0849c52bde8902adff1b419
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
(cherry-picked from qtbase commit af35ee291a1bbbc8627f9a17f7e104898d49b138)

5 years agoODBC: lost info about column metadata on SQL_NO_DATA
Israel Lins [Mon, 18 Mar 2013 02:20:55 +0000 (23:20 -0300)]
ODBC: lost info about column metadata on SQL_NO_DATA

In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata
is ignored.

Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoODBC: fixed consistence of return of QODBCResult::exec()
Israel Lins [Mon, 18 Mar 2013 02:23:15 +0000 (23:23 -0300)]
ODBC: fixed consistence of return of QODBCResult::exec()

The QODBCResult::exec() returns false when query is an delete
with no data do delete caused by SQLExecute function returning
SQL_NO_DATA, but the false return means error on execution.

Task-number:  QTBUG-10569
Change-Id: I6c7ebadcf62ab404b60c7bcccdab6a10bf16a923
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoODBC: fix loss of milliseconds when binding QDateTime
Israel Lins [Mon, 11 Feb 2013 19:13:24 +0000 (16:13 -0300)]
ODBC: fix loss of milliseconds when binding QDateTime

Caused by operator precedence error.

Follow-up to commit b8b79a0f37ec74fd5b4ad829e522a384ba3622ae

Task-number: QTBUG-2192
Change-Id: I17decd18c469b48a0bc938ae05c16cced8042219
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry-picked from qtbase commit 36b6d4afc970a328cced87af3d39b70d327eb3ad)
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoSSL internals: do not write after shutting down the socket
Peter Hartmann [Thu, 4 Apr 2013 09:30:43 +0000 (11:30 +0200)]
SSL internals: do not write after shutting down the socket

... but rather throw an error, so the HTTP layer can recover from a SSL
shutdown gracefully. In case the other side sent us a shutdown, we tried
to send one as well, which results in an error.

(backport of commit e145b67fbd54f147dab0f8e460280a9c8533aa7b)
Change-Id: I57291a5363cb0f6585dbd6aaa521c748766a1fdf
Reviewed-by: Richard J. Moore <rich@kde.org>
5 years agoIncrease the size of the QHostInfo cache.
Richard Moore [Sun, 3 Feb 2013 16:12:15 +0000 (16:12 +0000)]
Increase the size of the QHostInfo cache.

This change increases the size of the DNS cache in QHostInfo from 64
entries to 128. Given the figures in the google chrome performance paper
http://www.igvita.com/posa/high-performance-networking-in-google-chrome/
this should mean we can cache enough entries to handle 4 tabs at once.

(cherry picked from commit fd9013658bab096839154ae6e68adfd1a4e10189)

Change-Id: I824aa4127b6067c3ed6a2be3dbc819288ba41d1c
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
5 years agoAllow QHostInfo::lookupHost() with no receiver to warm the DNS cache.
Richard Moore [Mon, 4 Feb 2013 22:28:59 +0000 (22:28 +0000)]
Allow QHostInfo::lookupHost() with no receiver to warm the DNS cache.

This change lets you call QHostInfo::lookupHost() with a null receiver
in order to warm up the DNS cache. This allows you to try to get the
DNS request in flight early.

(cherry picked from commit 4030b6339c3dae4474f60b07700526fccf428b0c)

Change-Id: Ieac3c535b8f9b12a2f894510a898b349712e2fce
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
5 years agoAvoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1
Konstantin Ritt [Thu, 21 Jun 2012 20:33:07 +0000 (23:33 +0300)]
Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1

based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598

Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQNX host lookup: do not try to load libresolv.so, it is not there
Peter Hartmann [Mon, 22 Apr 2013 15:23:52 +0000 (17:23 +0200)]
QNX host lookup: do not try to load libresolv.so, it is not there

Not trying to load the lib saves 30 - 50ms upon an apps' 1st host
lookup.

Task-number: QTBUG-30809
(cherry picked from commit b4985215df767c14ddd888cbb2919be3a7617cfd)
Change-Id: If7338188c05f7fdf2ff80d06d91e7c7022e0e3d7
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
5 years agoFix for Sql query aliases with dots
Marko Kangas [Fri, 8 Feb 2013 10:10:26 +0000 (12:10 +0200)]
Fix for Sql query aliases with dots

Task-number: QTBUG-14904

Cherry-picked Qt5 change:
18be0749eb58316036d6eaff9dc5fecc1379f31a

Change-Id: I81edd9df68cfde15900315978dc3742ca6e22df5
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoFix a typo of an internal function name
Liang Qi [Tue, 23 Apr 2013 09:44:49 +0000 (11:44 +0200)]
Fix a typo of an internal function name

becomeDelegteForWindow -> becomeDelegateForWindow

Task-number: QTBUG-30754
Change-Id: Ied7fba42c642deb2c22ff414069659a62cb1a200
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix warning about narrowing inside {}
Olivier Goffart [Mon, 30 Apr 2012 12:14:11 +0000 (14:14 +0200)]
Fix warning about narrowing inside {}

Such as
qdialogbuttonbox.cpp:259:1: warning: narrowing conversion of
‘2147483650u’ from ‘unsigned int’ to ‘const int’ inside { }
[-Wnarrowing]

Cherry-picked from qtbase/e1d53553259e7edefb2a76712fd6a1ddc072d22d.

Change-Id: I7fa4b80cc21d5f4765c229f62ff977e7b9076e99
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix C++11 narrowing error.
Raphael Kubo da Costa [Sun, 7 Apr 2013 16:53:25 +0000 (19:53 +0300)]
Fix C++11 narrowing error.

src/opengl/qgl_x11.cpp:1805:21: error: non-constant-expression cannot be
narrowed from type 'unsigned int' to 'int' in initializer list
[-Wc++11-narrowing]
  0x20D4, options & QGLContext::CanFlipNativePixmapBindOption ? 0xFFFFFFFF : 0,

Simply add an explicit cast to the expression to make it build with libc++.

No cherry-pick, this file does not exist in qt5.

Change-Id: Ic2fc636fc21a87dae848c062acb048e4a623a1f2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix QTableView::doItemsLayout()
J-P Nurmi [Tue, 16 Apr 2013 15:53:46 +0000 (17:53 +0200)]
Fix QTableView::doItemsLayout()

Keep the content aligned to the bottom when the view has been scrolled
to the bottom and the content is relayouted (for example due to
sorting).

Task-number: QTBUG-30653
(cherry-picked from qtbase commit 00b11ccdead05d77589d4ec5ebb3b376c6ae2ca1)
Change-Id: I183145fbd84339e82d2d1d0bc39cea33d9cc9734
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
5 years agoQSystemTrayIcon: fix narrowing warning
Marc Mutz [Thu, 9 Aug 2012 13:43:56 +0000 (15:43 +0200)]
QSystemTrayIcon: fix narrowing warning

GCC complained:

  warning: narrowing conversion of
  ‘((QSystemTrayIconSys*)this)->QSystemTrayIconSys::<anonymous>.QWidget::winId()’
  from ‘WId {aka long long unsigned int}’ to ‘long int’ inside { } [-Wnarrowing]

Cherry-picked from qtbase/55819341a9fd899c3f105bd067dd2d1528c9efef.

Change-Id: Idb4caa09be160b8fed626bb154d6bf86c1a97f1c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoExplicitly cast some shorts to ushorts.
Raphael Kubo da Costa [Mon, 22 Apr 2013 19:04:42 +0000 (22:04 +0300)]
Explicitly cast some shorts to ushorts.

This should fix some C++11 build errors, as clang was warning that r, g and
b were being narrowed from short to ushort.

Change-Id: I15333063bfdff3503d00e8baac18adcc343dba4b
Reviewed-by: David Faure (KDE) <faure@kde.org>
5 years agoQThreadDataPrivate: fix data race on canWait boolean.
David Faure [Fri, 15 Mar 2013 18:47:46 +0000 (19:47 +0100)]
QThreadDataPrivate: fix data race on canWait boolean.

postEvent() accesses it with the postEventList mutex locked, but
processEvent() was checking it without any mutex locked.

Change-Id: I31bbb50f7a1c337067b8e3de16ee7cd11400b517
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/bf3a5ccef13d568662f027be62280aba1f73bada)
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFixed invalid memory read in SSSE3 image blending code.
Samuel Rodal [Fri, 19 Apr 2013 16:06:14 +0000 (17:06 +0100)]
Fixed invalid memory read in SSSE3 image blending code.

We need to do bounds comparison on the actual offset we're going to use
with _mm_load_si128 to read 16 bytes from memory (even though we won't
use the trailing bytes in the end).

Task-number: QTBUG-28324
(cherry-picked from qtbase commit 52619ae7787b3c4febb73a02afa623b12edabc97)
Change-Id: I705ae191312e5ffe25e45caea71ada73ec97f68d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFixed potential access violation in QPixmap::copy() for <32 bit pixmaps.
Samuel Rødal [Mon, 25 Feb 2013 08:58:34 +0000 (09:58 +0100)]
Fixed potential access violation in QPixmap::copy() for <32 bit pixmaps.

QImage is supposed to maintain the invariant that each scan-line begins
on a 4-byte boundary, so we need to verify that this is the case before
using the optimized path of short-cutting QImage::copy() by referencing
the source image's bits directly.

Task-number: QTBUG-14766
Change-Id: I0a178aeb2f34cc64f98deae9470b55b5c53fcb06
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit 711773776ed324efce7f1ed227104da9c7e21e05)
Reviewed-by: aavit <eirik.aavitsland@digia.com>
5 years agoFix clang build on Mac OS X
Danny Boelens [Wed, 17 Apr 2013 12:30:13 +0000 (14:30 +0200)]
Fix clang build on Mac OS X

Clang doesn't like the extra qualification in the forward declaration. Let's
move the forward declaration outside of the Qt namespace, which is better anyway
since TabletProximityRec is defined in the Apple headers/global namespace.

Task-number: QTBUG-29373
Change-Id: Iba59e6592ccbbcc09e91e1b9831a0ee588469b23
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoHarfbuzz: backporting fixes from upstream
Ahmed Saidi [Thu, 18 Apr 2013 18:27:55 +0000 (18:27 +0000)]
Harfbuzz: backporting fixes from upstream

81c8ef785b079980ad5b46be4fe7c7bf156dbf65 Fix crash!
81f2ecafa19b602f950df5a9e6e1b99c4b5ea55e Bug 30319
ff0612c2e7df1b86fc702c72e3015a6a5ae39b4c and
2dbd0fd11799c18bb6c66e337c3e31a1419823d4 Fix OOB access possibility
3bebe289aace6daa84b3d6983cebf5c58ddfad78 Fix problem with Indic shaper and control chars
90138e5a4d15c44f05456f90083ecacdc3196c8e Fix bad memory access in Myanmar shaper
b847f24ce855d24f6822bcd9c0006905e81b94d8 Fix Arabic cursive positioning
3ab7b37bdebf0f8773493a1fee910b151c4de30f Fix misc leaks

Change-Id: I6f3a6253782bff6abe4bf741d11c09fdd67542db
(cherry picked from qtbase/7df995a9bd3e989b4136f98424490604eb5178aa)
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>