profile/ivi/qtbase.git
12 years agoFixed most qdoc errors for the json classes.
Lars Knoll [Thu, 19 Jul 2012 11:53:50 +0000 (13:53 +0200)]
Fixed most qdoc errors for the json classes.

Change-Id: Ibbbdd7212f6c5e25422bbaa9ccaf4822db52222a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoDon't update geometry while the style is set
Andreas Holzammer [Thu, 19 Jul 2012 08:07:00 +0000 (10:07 +0200)]
Don't update geometry while the style is set

Under Windows CE a resize event gets fired
when the style is set, this will produce
geometry change events inside Qt, which will
end up in changing the geometry back and forth.

Change-Id: I7f834997abc53760ccfe2ad97012bb74dc5c705c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMove QWindowSystemInterface out of qpa.
Stephen Kelly [Tue, 10 Jul 2012 08:35:45 +0000 (10:35 +0200)]
Move QWindowSystemInterface out of qpa.

Public QtTest headers require it, so all unit tests would have to use private Qt
headers otherwise, which is not practical.

Change-Id: I5d4466ec30b6a57ebdfc34413e716e657eb51368
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoqdoc: Removed three qdoc files for qws example papges
Martin Smith [Thu, 19 Jul 2012 10:55:37 +0000 (12:55 +0200)]
qdoc: Removed three qdoc files for qws example papges

qws is no longer relevant. These pages are now deleted:
deleted:    mousecalibration.qdoc
deleted:    simpledecoration.qdoc
deleted:    svgalib.qdoc

Change-Id: I6ca77627cc6c018245cf16047b52c1145721e175
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoEnable CUPS auto detection on Windows
Rafael Roquetto [Wed, 18 Jul 2012 13:37:21 +0000 (15:37 +0200)]
Enable CUPS auto detection on Windows

Detect CUPS availability automatically when cross-compiling from a Windows
host.

Change-Id: Ife9bb90732c39794a7b760ced4aaea232612fe54
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoQWidget/Win: fix restoreGeometry() from fullscreen mode
Joerg Bornemann [Mon, 9 Jul 2012 10:33:36 +0000 (12:33 +0200)]
QWidget/Win: fix restoreGeometry() from fullscreen mode

When turning off fullscreen mode and restoring the widget's geometry
we must inform the QWindow about the geometry change synchronously.
Otherwise QWidget::geometry() will return the old value.

Using the same technique for the state transition to fullscreen mode
without sending a separate resize event.

Autotest: tst_QWidget::saveRestoreGeometry
Task-number: QTBUG-26421

Change-Id: I869e36cd302d9a94e398f48949ab3cb7ee9cdf51
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove Q_UNUSED for the metaObject.
Stephen Kelly [Wed, 18 Jul 2012 17:05:55 +0000 (19:05 +0200)]
Remove Q_UNUSED for the metaObject.

The object is no longer unused.

Change-Id: Ia82539220855321f2986c5791b70be5df399baca
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove the test tst_qdialog::throwInExec().
Friedemann Kleint [Wed, 18 Jul 2012 13:58:28 +0000 (15:58 +0200)]
Remove the test tst_qdialog::throwInExec().

QtWidgets and QtGui are currently compiled without exceptions,
which causes a crash with gcc 4.6.3.

Change-Id: I8f872f3bec6266444adf08d51a6678150c5fae8e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQDoc: Fix make commands for QDoc manual.
Casper van Donderen [Thu, 19 Jul 2012 10:39:41 +0000 (12:39 +0200)]
QDoc: Fix make commands for QDoc manual.

Change-Id: I55c3eae43928e87a0aa470127f9877741391deee
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agofix "No such ..." doc error for QString::toHtmlEscaped
Jeremy Katz [Wed, 18 Jul 2012 23:27:23 +0000 (01:27 +0200)]
fix "No such ..." doc error for QString::toHtmlEscaped

And a minor rephrase. [...] a HTML -> an HTML

Change-Id: I49804d009737b58ca3bb43e60dac869e045b5536
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." in qmargins
Jeremy Katz [Wed, 18 Jul 2012 23:16:38 +0000 (01:16 +0200)]
fix "No such ..." in qmargins

Is it more appropriate to rename the parameter in question
"margin", as suggested by the documentation, or have the
documentation refer to "m", as suggested by the code?

Change-Id: I5768ef044164e099ef1db77adda42171799cbf12
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." doc error for Qt::WindowType WindowOverridesSystemGestures
Jeremy Katz [Wed, 18 Jul 2012 22:51:36 +0000 (00:51 +0200)]
fix "No such ..." doc error for Qt::WindowType WindowOverridesSystemGestures

Is this a typo in the documentation, or in the enum?

Change-Id: I58ba12d74694b26ec0bf76226b56337a12e0756e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." error in qnamespace.qdoc
Jeremy Katz [Wed, 18 Jul 2012 22:43:10 +0000 (00:43 +0200)]
fix "No such ..." error in qnamespace.qdoc

RIP Qt::ClipOperation UniteClip
See 01b72952c38b9193138eabdab6bdab632cd75ebd for details

Change-Id: I8cfd5f6d008374741bea4f6a85827545ddb8ae86
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." doc error for QMetaType::typeName()
Jeremy Katz [Wed, 18 Jul 2012 22:22:17 +0000 (00:22 +0200)]
fix "No such ..." doc error for QMetaType::typeName()

Change-Id: If00c728ec793a65f62d76d8301c7f6658e7af8a0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." in doc for QMetaEnum::keysToValue()
Jeremy Katz [Wed, 18 Jul 2012 22:13:07 +0000 (00:13 +0200)]
fix "No such ..." in doc for QMetaEnum::keysToValue()

Change-Id: I4cc15031970a34ee1076933f7f13468ee17abcfd
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agofix "No such ..." doc error in QBasicTimer::start()
Jeremy Katz [Wed, 18 Jul 2012 22:08:11 +0000 (00:08 +0200)]
fix "No such ..." doc error in QBasicTimer::start()

Change-Id: I52feb5f2ebcc8821470468fc51ed3acc6df92a67
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd another directory to the private INCLUDE_DIRS list.
Stephen Kelly [Thu, 19 Jul 2012 08:40:25 +0000 (10:40 +0200)]
Add another directory to the private INCLUDE_DIRS list.

It should be possible to include both:

* <QtGui/private/qfoo.h>
* <private/qfoo.h>

Change-Id: I83ed5bba633b4a6b9bd38e315c987d78beecfb1b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoDereference so we can be sure the type is not forward declared.
Stephen Kelly [Thu, 19 Jul 2012 09:51:34 +0000 (11:51 +0200)]
Dereference so we can be sure the type is not forward declared.

Change-Id: I4d67a08dc645649e767153f3aa0dc57b15d50a84
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix window state handling
Andreas Holzammer [Thu, 19 Jul 2012 09:05:18 +0000 (11:05 +0200)]
Fix window state handling

There is no need to query each time the window state
from windows, as we already know in which state it is.
We are also getting state change notifications. This fixes
issues under Windows CE.

Change-Id: I69f4d5d504e2341555d9991c68e82beed2e8129c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agofix "No such ..." for QMimaeDatabase::mimeTypeForFile()
Jeremy Katz [Thu, 19 Jul 2012 00:44:43 +0000 (02:44 +0200)]
fix "No such ..." for QMimaeDatabase::mimeTypeForFile()

Change-Id: Ife8e361524ac324ce2cfb20d952db5be042fecc1
Reviewed-by: David Faure <faure@kde.org>
12 years agofix "No such ..." for QObject::connect(...,functor) doc
Jeremy Katz [Thu, 19 Jul 2012 01:39:00 +0000 (03:39 +0200)]
fix "No such ..." for QObject::connect(...,functor) doc

Change-Id: Idd1d871b0fde899fdd21ce5aa365e08e2c7bcf45
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agofix "No such ..." documentation errors in QAbstractItemModel
Jeremy Katz [Wed, 18 Jul 2012 21:44:54 +0000 (23:44 +0200)]
fix "No such ..." documentation errors in QAbstractItemModel

Change-Id: Ic1d0761c310c47f95d98988d77aff0f8e46de5fb
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoImprove Windows XP and Vista styles auto detection
Rafael Roquetto [Wed, 18 Jul 2012 13:25:13 +0000 (15:25 +0200)]
Improve Windows XP and Vista styles auto detection

Do not build windows styles when the target platform is not Windows. This
makes a difference when cross-compiling.

Change-Id: I2184d39ed253af1069c5cdcd6a848611cff24789
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agouse QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIR
Oswald Buddenhagen [Thu, 12 Jul 2012 18:33:25 +0000 (20:33 +0200)]
use QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIR

this is what this code assumes anyway

Change-Id: I667412b101c18325321a568cc22d25ef07418ffb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove QTDLL_POSTFIX stuff
Oswald Buddenhagen [Thu, 12 Jul 2012 14:49:02 +0000 (16:49 +0200)]
remove QTDLL_POSTFIX stuff

the libinfix provides a way cleaner solution to that. i don't expect it
to be still actually used anyway.

Change-Id: I051522ec3abb3d92c529b5462b8514a706aa2ba1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
12 years agoremove needless/commented INCLUDEPATHs
Oswald Buddenhagen [Fri, 13 Jul 2012 11:20:13 +0000 (13:20 +0200)]
remove needless/commented INCLUDEPATHs

Change-Id: Id1d3afde424e0e17e68889d6f7b51e3056754536
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoqmetaobject_p.h: don't (incorrectly) fwd-declare QVarLengthArray
Marc Mutz [Mon, 16 Jul 2012 14:49:51 +0000 (16:49 +0200)]
qmetaobject_p.h: don't (incorrectly) fwd-declare QVarLengthArray

qmetaobject_p.h forward-declared QVarLengthArray without the default parameter
for the 'int' template argument. This violates the ODR, so just #include the
header instead. It's not like there's much point in the fwd declaration in
a private header.

Change-Id: Ie5ef1740c57da396c95f5bae1cd81ac941a8ac2d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix typo in configure for Mac: Libraries -> Library
Sergio Ahumada [Wed, 18 Jul 2012 08:29:07 +0000 (10:29 +0200)]
Fix typo in configure for Mac: Libraries -> Library

Task-number: QTBUG-18115
Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoput the include/ of all modules into qtbase when doing non-prefix build
Oswald Buddenhagen [Tue, 10 Jul 2012 19:35:39 +0000 (21:35 +0200)]
put the include/ of all modules into qtbase when doing non-prefix build

all other build artifacts go into qtbase's build directory anyway. this
asymmetry was confusing and causes cmake users some grief.

Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agogenerate the module version header directly in the include directory
Oswald Buddenhagen [Tue, 17 Jul 2012 14:09:41 +0000 (16:09 +0200)]
generate the module version header directly in the include directory

... instead of having a forward from the include dir to the (shadowed)
source dir of the module.

Change-Id: I967227950e8aeb1b9f62befbf9fff3746a0486b6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMake the QIncompatibleFlag constexpr.
Stephen Kelly [Fri, 13 Jul 2012 18:40:09 +0000 (20:40 +0200)]
Make the QIncompatibleFlag constexpr.

Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoTrack window state in manual test windowflags.
Friedemann Kleint [Wed, 18 Jul 2012 08:10:01 +0000 (10:10 +0200)]
Track window state in manual test windowflags.

Change-Id: Ief6cd4b29ddcc946e1ccac75b352da80bbf647d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix rendering glitches when using native widgets in MDI subwindows
Miikka Heikkinen [Tue, 17 Jul 2012 13:35:38 +0000 (16:35 +0300)]
Fix rendering glitches when using native widgets in MDI subwindows

When mixing native and regular widgets in same QMdiArea, some
subwindows didn't properly get set native. This was because
when a native parentless widget was given a parent, it wouldn't
enforce native window on the new parent and its ancestors.
This happened because window flags were adjusted too late in
relation to createWinId() call in setParent_sys().
Fixed by moving the createWinId() call to its proper place.

Also removed some old Q_WS_* ifdeffing in QWidget::setParent() that
masked some native enforcement code.

Additionally removed few QEXPECT_FAILs from QWidget autotest now
that those cases work correctly.

Task-number: QTBUG-26424
Change-Id: Ib6f9d0531e5c7299e2c307734d49c81f1ffa9713
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWidgets: Fix duplicated line in QMdiArea
Sergio Ahumada [Wed, 18 Jul 2012 08:37:56 +0000 (10:37 +0200)]
Widgets: Fix duplicated line in QMdiArea

Replace duplicated line MaximizeAction with RestoreAction

Task-number: QTBUG-17428
Change-Id: I5120afeed6715d28045f3eee01f26ee482f02ed1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQtNetwork: normalize signals/slots
Marc Mutz [Thu, 12 Jul 2012 20:26:31 +0000 (22:26 +0200)]
QtNetwork: normalize signals/slots

This is the result of running util/normalize --modify
from Qt 4.7  with manual review.

Change-Id: I3f89d5138ea9905c42ed581991426e72c90d4069
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAuto detect iconv on Windows hosts
Rafael Roquetto [Wed, 18 Jul 2012 12:06:42 +0000 (14:06 +0200)]
Auto detect iconv on Windows hosts

Enable auto detection for iconv when
cross-compiling from Windows hosts.

Change-Id: I699e0a31d938403f5e80e74be90df87f11f361ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix auto detection in configure.exe
Rafael Roquetto [Wed, 18 Jul 2012 12:01:08 +0000 (14:01 +0200)]
Fix auto detection in configure.exe

All auto detection tests were failing
because the default mkspec was not yet
installed during the time they were run.

Change-Id: Iad14580f38d1539d9831917e5c9c707eae4c0c90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMirror potentially themeable style hints in QPlatformTheme.
Friedemann Kleint [Thu, 12 Jul 2012 07:54:50 +0000 (09:54 +0200)]
Mirror potentially themeable style hints in QPlatformTheme.

Currently, most of the QStyleHint-values are potentially
configureable by the user in certain desktop environments.

Add them to the QPlatformTheme and query the theme first.

Keep the values in QPlatformIntegration such that simple
integrations that do not implement themes are not forced
to implement them to change the values.

Change-Id: I15742a5968df0ad5d7398cceae640dc7e541da52
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFollow gbm api changes in kms plugin
Laszlo Agocs [Tue, 17 Jul 2012 09:45:20 +0000 (12:45 +0300)]
Follow gbm api changes in kms plugin

Change-Id: I3058f4d3540b04710a853bbaa901bdbecf35b4b5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoTear down properly in kms plugin when exiting
Laszlo Agocs [Tue, 17 Jul 2012 07:44:18 +0000 (10:44 +0300)]
Tear down properly in kms plugin when exiting

Change-Id: Idad060af4a8b4e68c2312cc2b69de39d2a58a1c4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdd config test for kms
Laszlo Agocs [Mon, 16 Jul 2012 13:13:18 +0000 (16:13 +0300)]
Add config test for kms

Change-Id: I55afc65d356aaca0fe443dda100805a4df8f0ae6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix incorrect #endif comment.
Casper van Donderen [Mon, 16 Jul 2012 12:25:52 +0000 (14:25 +0200)]
Fix incorrect #endif comment.

Change-Id: I7cf93b928c7ee9915fe95e13f3faa036ac05f608
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoremoving QT_NO_URLINFO and using QT_NO_FTP instead
Tasuku Suzuki [Tue, 10 Jul 2012 15:31:47 +0000 (00:31 +0900)]
removing QT_NO_URLINFO and using QT_NO_FTP instead

URLINFO was removed from qfeature.txt but QT_NO_URLINFO macro was not
removed. As QUrlInfo is now private and only used for FTP, the class can
be disabled when FTP is disabled.

Change-Id: Ic63b066f8ff9ad1eea0073ab75b622e5739ac5a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix widget animations.
Friedemann Kleint [Mon, 16 Jul 2012 14:14:17 +0000 (16:14 +0200)]
Fix widget animations.

- Update opacity.
- Change Q_WS_WIN to Q_OS_WIN.

Task-number: QTBUG-25436
Change-Id: I76c1e4668dc2ee4f4d861da320c10aa05e57e804
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoSet correct QT_LFLAGS_SQLITE for default cases.
Rafael Roquetto [Tue, 17 Jul 2012 09:52:10 +0000 (11:52 +0200)]
Set correct QT_LFLAGS_SQLITE for default cases.

In systems where no pkgconfig is available, such as QNX, we set
QT_LFLAGS_SQLITE to the default values.

Change-Id: I24edd589ce7baf2614480a91842ca756ead39463
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoWindows: Do not return short path names for QDir::tempPath().
Friedemann Kleint [Mon, 16 Jul 2012 13:35:58 +0000 (15:35 +0200)]
Windows: Do not return short path names for QDir::tempPath().

WinAPI GetTempPath() sometimes returns short names
for C:/Users/<user>/AppData/Local/Temp.

Change-Id: I33f991acc06e652ccd484d36a5a384eb776f8395
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoUnix printing: Fix suggested file name for printing to file.
Friedemann Kleint [Tue, 17 Jul 2012 07:52:31 +0000 (09:52 +0200)]
Unix printing: Fix suggested file name for printing to file.

Change-Id: Ieefe602dc8328a2e4188f7fa341016f8e330526e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoTypo in QWaitCondition::wait() doc: lcokedReadWriteLock
Jeremy Katz [Mon, 16 Jul 2012 20:38:18 +0000 (22:38 +0200)]
Typo in QWaitCondition::wait() doc: lcokedReadWriteLock

lcokedReadWriteLock -> lockedReadWriteLock

Change-Id: I560f7445d6a0c332ee8ca8f62a8318f637567520
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoCorrect documentation for Void metatype value, define UnknownType
Jeremy Katz [Mon, 16 Jul 2012 20:19:55 +0000 (22:19 +0200)]
Correct documentation for Void metatype value, define UnknownType

QMetaType::Type::Void was misdocumented as being equal to 0. The
actual value for Void is currently 43. UnknownType is 0.

Change-Id: I4e9cb3b4d21e10e1691b985a6ad635bc7a04f1b7
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd new metatypes to QMetaType::Type enum for docs
Jeremy Katz [Mon, 16 Jul 2012 20:14:23 +0000 (22:14 +0200)]
Add new metatypes to QMetaType::Type enum for docs

This adds QRegularExpression, QJson{Value,Object,Array,Document}, and
SChar

Change-Id: I3dbe9d197952e980f0de9eaed2605d190b8d0405
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove Qt3Support enums for q{dir,filedevice,settings,variant} in docs
Jeremy Katz [Mon, 16 Jul 2012 19:05:47 +0000 (21:05 +0200)]
Remove Qt3Support enums for q{dir,filedevice,settings,variant} in docs

Change-Id: I07942447bb756561e5c502c9a0c03b6aaf8133d1
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove documentation of previously deleted Accessibility events
Jeremy Katz [Mon, 16 Jul 2012 16:39:47 +0000 (18:39 +0200)]
Remove documentation of previously deleted Accessibility events

Change-Id: I7996f2f9b6d11cea130e2a56d0997e1f208e5642
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoRemove documentation of Qt3Support enums in qcoreevent.cpp
Jeremy Katz [Mon, 16 Jul 2012 16:36:00 +0000 (18:36 +0200)]
Remove documentation of Qt3Support enums in qcoreevent.cpp

Change-Id: Id8740adaa26ee44f40010373947a5be82942b0ba
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoInstall right version of tools when x-compiling.
Rafael Roquetto [Mon, 16 Jul 2012 16:23:33 +0000 (18:23 +0200)]
Install right version of tools when x-compiling.

When cross-compiling from a Windows host, we need to install the right (win32)
versions of syncqt and qmake into the target folder.

Change-Id: I35fc4b05bb6ad7605bc932cae527372a9fe0ba3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoNormalize signal/slots.
Sergio Martins [Fri, 23 Mar 2012 23:07:43 +0000 (23:07 +0000)]
Normalize signal/slots.

Change-Id: I0a0f497ece081a430437adc2959deb247defcde9
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix infinite loop due to FPU limitation
Stéphane Cerveau [Tue, 17 Jul 2012 06:11:28 +0000 (08:11 +0200)]
Fix infinite loop due to FPU limitation

Bug detected with animatedtiles in example/animation.
In qpa mode, using some specific resolution of directfb such as
800x600 causes a bug in FillRectF where there is an infinite loop due
to scalabilty of qreal value: One is rounded and the other not.

Change-Id: I1707e53f34aeeadc0f0fc07b1dca148fbe05b5f1
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoQSqlTM: add reimplemented record() method
Mark Brand [Wed, 11 Jul 2012 14:29:53 +0000 (16:29 +0200)]
QSqlTM: add reimplemented record() method

QSqlQueryModel::record(row) populates the record it returns with values
from virtual data(), so the values themselves can be supplied by
QSqlTableModel. However, it is also desirable to be able to interrogate
QSqlTableModel for the actual current record in its cache, including
properties such as the generated flag.

Change-Id: I733901913b7d237d5762448e953a99b5bd83fc7f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoQSqlTM: use generated flag more correctly in setRecord()/insertRecord()
Mark Brand [Wed, 11 Jul 2012 07:52:14 +0000 (09:52 +0200)]
QSqlTM: use generated flag more correctly in setRecord()/insertRecord()

The generated flag should affect the generation of SQL commands rather
than how the fields of the source record are applied to the model before
submitting. This correction allows setRecord() to be used to change TRUE
generated flags to FALSE.

Clarified documentation on this point and updated change log.

Change-Id: I7ee124930822561ed8beee6c6259970b3e929c9b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoDon't join between 2 same points
Charles Yin [Mon, 16 Jul 2012 01:32:22 +0000 (11:32 +1000)]
Don't join between 2 same points

Joining 2 points with same x,y values causes assert in QTriangulatingStroker::normalVector().

Task-number: QTBUG-26528
Change-Id: I2494d7f362e13e41a82753f4bacf97ffbc249cf9
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoFix error when inserting to tables with datetime fields with QODBC
Thiago A. Correa [Fri, 13 Jul 2012 17:28:18 +0000 (14:28 -0300)]
Fix error when inserting to tables with datetime fields with QODBC

SQL Server 10 introduced stricter rules for TIMESTAMP validation,
making it necessary to specify the decimal digits.
Other databases might do the same as well, so this patch introduces
a check for the TIMESTAMP column size and adjusts the decimal digits
parameter as needed.

Task-number: QTBUG-2192

Change-Id: If6d798c6c928ebda75bc474e49a07fbbfbe5816c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoList .pbm and .pgm as supported writable image file formats.
Kim Motoyoshi Kalland [Mon, 16 Jul 2012 14:46:08 +0000 (16:46 +0200)]
List .pbm and .pgm as supported writable image file formats.

QImageWriter can write .pbm and .pgm files, but didn't list them
among its supported image file formats.

Task-number: QTBUG-22958
Change-Id: I777c7cd9a4b56fcf313248a29a917e594a5e4477
Reviewed-by: aavit <qt_aavit@ovi.com>
12 years agoQStateMachine: mark a ctor as explicit
Marc Mutz [Mon, 16 Jul 2012 14:54:50 +0000 (16:54 +0200)]
QStateMachine: mark a ctor as explicit

Commit 0b66f723f06f6d115ea37d4db8bb6c0b5f63885b recently introduced a new
QStateMachine constructor, but failed to mark it as explicit. Fix.

Change-Id: I16037691ad77d528bb50b611c03063b17a71dd34
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoundocument enums as part of Qt3Support removal
Jeremy Katz [Mon, 16 Jul 2012 14:40:29 +0000 (16:40 +0200)]
undocument enums as part of Qt3Support removal

Lots of enums in the Qt namespace used to be hidden or documented
as obsolete. These have been removed entirely, as they result in
qdoc errors.

Change-Id: I67726d7358f4e71a0c8fc5181388b1cf8fd4e4bd
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd gui/ to qtcore.qdocconf to pick up enums in Qt namespace
Jeremy Katz [Mon, 16 Jul 2012 13:01:54 +0000 (15:01 +0200)]
Add gui/ to qtcore.qdocconf to pick up enums in Qt namespace

Qt::HitTestAccuracy and Qt::WhiteSpaceMode are defined in gui/ but
documented as part of the Qt namespace, so qdoc needs to look there
to find the relevant enums.

Change-Id: I36ae71c44024b12664688129044994926160e5c9
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoremove support for forwarding module pri creation via syncqt
Oswald Buddenhagen [Tue, 3 Apr 2012 12:19:10 +0000 (14:19 +0200)]
remove support for forwarding module pri creation via syncqt

now that all modules have migrated, this dead code can be removed.

Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoGenerate a fatal error as appropriate.
Stephen Kelly [Fri, 13 Jul 2012 17:32:47 +0000 (19:32 +0200)]
Generate a fatal error as appropriate.

Otherwise, subdirectories under directories which are added to
a resource file generate garbage in the binary.

The easiest way to see this is

 cd tests/auto/corelib/kernel/qvariant
 mkdir stream/qt4.9/somedir
 make && ./tst_qvariant loadQt4Stream

Change-Id: I32630ecb6d515db1d135f0ffc5cf14fd8caa0a4f
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoCreate imported targets if the library files exist
Stephen Kelly [Sun, 24 Jun 2012 17:36:27 +0000 (19:36 +0200)]
Create imported targets if the library files exist

Handle the cases where the user does

  ./configure -debug
  make
  make install
  make release
  make release_install

Thereby making the installed configuration different to the
'configured' configuration.

Change-Id: Ib351d8a84c4333ebcbd305d68a37c16f86869559
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoUndocument Qt::AnchorAttribute
Jeremy Katz [Mon, 16 Jul 2012 12:53:13 +0000 (14:53 +0200)]
Undocument Qt::AnchorAttribute

AnchorAttribute was removed as part of the Qt3Support cleanup.

Change-Id: I58d8e471d4bc1af420ec8eaab6d34c1718b30382
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoQWidget::showFullScreen fixed for widgets with valid size hint
Joerg Bornemann [Mon, 16 Jul 2012 09:11:06 +0000 (11:11 +0200)]
QWidget::showFullScreen fixed for widgets with valid size hint

Ensure the initial size is valid, since we store it as normalGeometry
below.

Task-number: QTBUG-26226
Change-Id: I3a55c389a48504699942930063089c80657687a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
12 years agoReplace Q_WS_ in tests by Q_OS_ or check platform names.
Friedemann Kleint [Mon, 16 Jul 2012 12:46:08 +0000 (14:46 +0200)]
Replace Q_WS_ in tests by Q_OS_ or check platform names.

Change-Id: Ica445cf1e83bfaab870ac344d6c02766f047a5cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agotst_qwidget: check widget geometry in fullscreen mode
Joerg Bornemann [Mon, 16 Jul 2012 08:11:10 +0000 (10:11 +0200)]
tst_qwidget: check widget geometry in fullscreen mode

Change-Id: Idc45c6d18decf3c71c6736742434ad9d0cccd2d2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix window size issue under Windows CE
Andreas Holzammer [Mon, 16 Jul 2012 12:58:00 +0000 (14:58 +0200)]
Fix window size issue under Windows CE

Under Windows CE the top title window bar needs
to be taken into account when creating a window,
so the Style WS_OVERLAPPED needs to be passed to
AdjustWindowRectEx, to get the right size of the
window. For the desktop the documentation says,
that you should not pass the WS_OVERLAPPED flag,
but wince does not talk about this.

Change-Id: Id8c9d28b7aa04a9920e4cb81ac11463d9717a0e7
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove #ifdef Q_WS_ / include / #endif conditionals.
Friedemann Kleint [Mon, 16 Jul 2012 11:47:04 +0000 (13:47 +0200)]
Remove #ifdef Q_WS_ / include / #endif conditionals.

Change-Id: I734490ddcb5501e620370e50ef06180ab5e23393
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix applicationName() being empty in QApplication.
David Faure [Sat, 23 Jun 2012 08:02:11 +0000 (10:02 +0200)]
Fix applicationName() being empty in QApplication.

A virtual method was reimplemented to return an always-empty string,
probably a leftover from a refactoring.

This fix showed that tst_qwidget_window was buggy: between Qt4 and Qt5,
a "Before" became "After", which made "Before" unused, and was masking
the fact that the app name was empty by default. In addition, the
earlier Qt5 change that made the app name default to argv[0] now requires
updating this test, now that it's actually working.

Change-Id: I5360026821a9b95bedd0ff09dba3d51a22e542b7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoImprove qDebug() << QAccessibleEvent() to display state changes
Jan-Arve Saether [Fri, 13 Jul 2012 07:40:32 +0000 (09:40 +0200)]
Improve qDebug() << QAccessibleEvent() to display state changes

Change-Id: I4624bcf94c1290d14ea5f5eaaa5449af10ac2186
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoDoc: Fix typo
Sergio Ahumada [Mon, 16 Jul 2012 12:12:21 +0000 (14:12 +0200)]
Doc: Fix typo

Task-number: QTBUG-23657
Change-Id: I3115f45f743da5699aa13f31a0f2de013d428aba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdded a reserved data pointer in QPaintDevice.
Alexandros Dermenakis [Mon, 16 Jul 2012 11:08:09 +0000 (13:08 +0200)]
Added a reserved data pointer in QPaintDevice.

Change-Id: If547e5525635e7c76db7a02c7c0c300c87373a18
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoDoc: Fix typo foreigh -> foreign
Sergio Ahumada [Mon, 16 Jul 2012 11:57:22 +0000 (13:57 +0200)]
Doc: Fix typo foreigh -> foreign

Task-number: QTBUG-23260
Change-Id: I922a8b5cba5d8784305fb1779ccd352ab2ece365
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agohandle XInput 2.2 multipoint touch events
Shawn Rutledge [Wed, 4 Jul 2012 13:59:02 +0000 (15:59 +0200)]
handle XInput 2.2 multipoint touch events

Change-Id: I5c925ae3e191244c7ab9415e4ba2fe49b93dd2af
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoRemove QToolButton's protected constructor
Ivan Komissarov [Wed, 4 Jul 2012 16:45:24 +0000 (20:45 +0400)]
Remove QToolButton's protected constructor

As long as QToolButtonPrivate is declared in .cpp file,
this constructor is useless.

Change-Id: Ibbeaf291b88b3b203e5107e0227d68e65cbb9eee
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix QSplashScreen on X11.
Friedemann Kleint [Mon, 16 Jul 2012 10:22:04 +0000 (12:22 +0200)]
Fix QSplashScreen on X11.

Use code from QTestLib to wait for the Window to show up.

Change-Id: Ib674f3eb7a6c32cad1d502caefe7d4b073754e73
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoUse DropShadow from QPlatformTheme everywhere in qwhatsthis.cpp.
Friedemann Kleint [Mon, 16 Jul 2012 10:24:27 +0000 (12:24 +0200)]
Use DropShadow from QPlatformTheme everywhere in qwhatsthis.cpp.

Change-Id: Ib8281d44e2d4b51aba13417c26247d3e19b1b2f8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoReplace some Q_WS_X11 by check for platform's name.
Friedemann Kleint [Mon, 16 Jul 2012 10:25:49 +0000 (12:25 +0200)]
Replace some Q_WS_X11 by check for platform's name.

Change-Id: I33d7ce31e01c355e0d9e05c98d6a84ea4f6d5bbd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix the use of if() inside of macro().
Stephen Kelly [Wed, 11 Jul 2012 09:25:59 +0000 (11:25 +0200)]
Fix the use of if() inside of macro().

if() seems to behave differently with macro parameters compared to
variables set with set().

Change-Id: Ieb9544b8c3187579fd4cfe25e2c2afa3f349eba6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoMake qwindowsysteminterface.cpp compile with QT_NO_SHORTCUT
Jeremy Katz [Fri, 29 Jun 2012 11:25:31 +0000 (13:25 +0200)]
Make qwindowsysteminterface.cpp compile with QT_NO_SHORTCUT

Task-number: QTBUG-24816

Change-Id: Ia3d20775d28922ee94f965b4a7bc993915f34d6b
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
12 years agoFix crash in QPixmap::fromImage() when memory is low.
Kim Motoyoshi Kalland [Fri, 13 Jul 2012 10:42:18 +0000 (12:42 +0200)]
Fix crash in QPixmap::fromImage() when memory is low.

Task-number: QTBUG-26451

Change-Id: I7149edb1b03d7bcd4e90f369a1ac99b25ab262b9
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agostatemachine: Move RestorePolicy enum to QState class
Kent Hansen [Fri, 13 Jul 2012 17:30:33 +0000 (19:30 +0200)]
statemachine: Move RestorePolicy enum to QState class

This makes it possible to add API for setting the restore policy
per state, or even per property assignment (QTBUG-17861).

This change is fully source compatible with Qt4.

Change-Id: I53628546b070f6fc84891f86e7ad7bd8ef5ba285
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoAdd QStateMachine constructor that takes a ChildMode
Kent Hansen [Fri, 13 Jul 2012 18:11:45 +0000 (20:11 +0200)]
Add QStateMachine constructor that takes a ChildMode

Back when QStateMachine was changed to inherit QState, this
constructor was conveniently left out because setting the state
machine (root state) to be a parallel state group didn't actually
work. But as of commit d281aa6936ad01e28dacabb41bd9eb59891f85a1,
it does work, so add the missing constructor.

Task-number: QTBUG-15430
Change-Id: I68c599baa0ef1bfc869195140cf5daf645e75b8b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agomake QMAKE_RESOLVED_TARGET use normalized path separators
Oswald Buddenhagen [Thu, 12 Jul 2012 09:17:40 +0000 (11:17 +0200)]
make QMAKE_RESOLVED_TARGET use normalized path separators

Change-Id: I23433a67364a9d09fa239b2c7f2cae495d3cc6df
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomake use of new functions
Oswald Buddenhagen [Thu, 12 Jul 2012 09:16:53 +0000 (11:16 +0200)]
make use of new functions

makes for cleaner code

Change-Id: I1a86bc4cac3778a1df37aa3307e5a8edac246961
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoautomatically fix separators in QMAKE_{DIST,}CLEAN
Oswald Buddenhagen [Thu, 12 Jul 2012 10:08:42 +0000 (12:08 +0200)]
automatically fix separators in QMAKE_{DIST,}CLEAN

it's a tad insane to expect the user to do that

Change-Id: I75c68f2a28656c9ba2e3fabcc79718b899b29ce7
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agofix object file name clash
Oswald Buddenhagen [Fri, 13 Jul 2012 17:39:59 +0000 (19:39 +0200)]
fix object file name clash

under extremely rare circumstances this would have actually failed

Change-Id: I4132d0f82e9f924e92e9e96f6d34451c94a67201
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoTest QVariant copy with a user type instead of a QtNetwork type.
Stephen Kelly [Fri, 13 Jul 2012 18:18:40 +0000 (20:18 +0200)]
Test QVariant copy with a user type instead of a QtNetwork type.

Change-Id: I78acc8a843eb12a2606f491d1a29e1bcd408d60f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRun QIcon related crash test with the other QtGui types.
Stephen Kelly [Fri, 13 Jul 2012 18:02:29 +0000 (20:02 +0200)]
Run QIcon related crash test with the other QtGui types.

Change-Id: I475cfc5a91a046951feecb425f8235ad37f1ba44
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoDon't declare built-in metatypes as metatypes again.
Stephen Kelly [Thu, 12 Jul 2012 14:22:15 +0000 (16:22 +0200)]
Don't declare built-in metatypes as metatypes again.

Change-Id: Iba9804299e8f6e2db10965fdc719ee26f197758e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix typo qith -> with.
Stephen Kelly [Fri, 13 Jul 2012 17:32:30 +0000 (19:32 +0200)]
Fix typo qith -> with.

Change-Id: Ie9eaa016c61f929be17fd1687517540c2ae1f3d2
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoAvoid crash when getting bearings from fallback font engine
Eskil Abrahamsen Blomfeldt [Fri, 13 Jul 2012 12:17:26 +0000 (14:17 +0200)]
Avoid crash when getting bearings from fallback font engine

When accessing a fallback engine, we always need to call
ensureEngineAt() to make sure it's loaded.

Change-Id: Ib27e34137cfe8a3dd2b358aef3b3296a4ca52478
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoAdd some tests to note that private signals can't be overloads.
Stephen Kelly [Fri, 13 Jul 2012 09:48:09 +0000 (11:48 +0200)]
Add some tests to note that private signals can't be overloads.

This is just for completeness of the understanding of the limitations
of private signals. There are no private signals in Qt which have
overloads.

Change-Id: Ic34c555aea360ee34beec796e597657888573da9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoSimplify the moc code related to private signals a bit.
Stephen Kelly [Fri, 13 Jul 2012 08:55:38 +0000 (10:55 +0200)]
Simplify the moc code related to private signals a bit.

Change-Id: I0e9bae82c7c6d313e4161c35d0b988f633d5ae60
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years ago[QNX] Force UNIX-style separators on Windows hosts
Rafael Roquetto [Fri, 13 Jul 2012 09:11:55 +0000 (11:11 +0200)]
[QNX] Force UNIX-style separators on Windows hosts

The QNX toolchain, even on Windows, uses UNIX-style directory separators
('/').

Change-Id: I78575c9856b1700438c05ec0da81149688d85522
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>