Commit Graph

8377 Commits

Author SHA1 Message Date
Jeremy Katz
b8e658d169 fix "No such ..." for QObject::connect(...,functor) doc
Change-Id: Idd1d871b0fde899fdd21ce5aa365e08e2c7bcf45
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2012-07-19 08:43:25 +02:00
Jeremy Katz
9a805df962 fix "No such ..." documentation errors in QAbstractItemModel
Change-Id: Ic1d0761c310c47f95d98988d77aff0f8e46de5fb
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
2012-07-19 02:32:07 +02:00
Rafael Roquetto
6715c4fb2e 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>
2012-07-19 02:31:24 +02:00
Oswald Buddenhagen
80749d946b 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>
2012-07-18 22:35:10 +02:00
Oswald Buddenhagen
a89bd2d2fb 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>
2012-07-18 22:34:49 +02:00
Oswald Buddenhagen
2d04ea0f61 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>
2012-07-18 19:53:37 +02:00
Marc Mutz
41e67d1ac4 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>
2012-07-18 19:53:27 +02:00
Sergio Ahumada
bf3b08ee06 Fix typo in configure for Mac: Libraries -> Library
Task-number: QTBUG-18115
Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-18 19:51:38 +02:00
Oswald Buddenhagen
5f0b52ea26 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>
2012-07-18 19:48:59 +02:00
Oswald Buddenhagen
28d5967e68 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>
2012-07-18 19:48:59 +02:00
Stephen Kelly
2750832410 Make the QIncompatibleFlag constexpr.
Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-07-18 19:48:59 +02:00
Friedemann Kleint
8683ee14cc Track window state in manual test windowflags.
Change-Id: Ief6cd4b29ddcc946e1ccac75b352da80bbf647d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-18 15:37:48 +02:00
Miikka Heikkinen
150284198b 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>
2012-07-18 15:07:32 +02:00
Sergio Ahumada
006b620ef9 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>
2012-07-18 14:48:16 +02:00
Marc Mutz
94dc63cd49 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>
2012-07-18 14:40:38 +02:00
Rafael Roquetto
d524e326e4 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>
2012-07-18 14:37:36 +02:00
Rafael Roquetto
96bf9b181c 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>
2012-07-18 14:36:12 +02:00
Friedemann Kleint
fc3207dfe1 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>
2012-07-18 08:18:46 +02:00
Laszlo Agocs
26318a8cb2 Follow gbm api changes in kms plugin
Change-Id: I3058f4d3540b04710a853bbaa901bdbecf35b4b5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2012-07-18 08:16:27 +02:00
Laszlo Agocs
7142e8bd23 Tear down properly in kms plugin when exiting
Change-Id: Idad060af4a8b4e68c2312cc2b69de39d2a58a1c4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2012-07-18 08:15:52 +02:00
Laszlo Agocs
504c2cb1e1 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>
2012-07-18 08:15:30 +02:00
Casper van Donderen
402b319633 Fix incorrect #endif comment.
Change-Id: I7cf93b928c7ee9915fe95e13f3faa036ac05f608
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2012-07-18 05:14:31 +02:00
Tasuku Suzuki
019c6d6628 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>
2012-07-17 22:07:58 +02:00
Friedemann Kleint
cdc436ebe6 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>
2012-07-17 15:56:15 +02:00
Rafael Roquetto
a94e917eeb 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>
2012-07-17 15:56:15 +02:00
Friedemann Kleint
fe4adec894 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>
2012-07-17 15:56:15 +02:00
Friedemann Kleint
dc4cd551c6 Unix printing: Fix suggested file name for printing to file.
Change-Id: Ieefe602dc8328a2e4188f7fa341016f8e330526e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-17 15:56:15 +02:00
Jeremy Katz
178f5e2ac3 Typo in QWaitCondition::wait() doc: lcokedReadWriteLock
lcokedReadWriteLock -> lockedReadWriteLock

Change-Id: I560f7445d6a0c332ee8ca8f62a8318f637567520
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-07-17 15:56:15 +02:00
Jeremy Katz
f66beaaf07 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>
2012-07-17 15:56:15 +02:00
Jeremy Katz
9b13f2b913 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>
2012-07-17 15:56:15 +02:00
Jeremy Katz
a105365ff2 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>
2012-07-17 15:56:15 +02:00
Jeremy Katz
26c8f9d0ef 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>
2012-07-17 15:56:15 +02:00
Jeremy Katz
94bbafc369 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>
2012-07-17 15:56:15 +02:00
Rafael Roquetto
7267ebe004 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>
2012-07-17 12:52:48 +02:00
Sergio Martins
6441479ac5 Normalize signal/slots.
Change-Id: I0a0f497ece081a430437adc2959deb247defcde9
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-07-17 12:39:38 +02:00
Stéphane Cerveau
50e15401c9 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>
2012-07-17 08:19:31 +02:00
Mark Brand
fbf010a266 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>
2012-07-17 08:13:42 +02:00
Mark Brand
76880aa2c4 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>
2012-07-17 08:13:30 +02:00
Charles Yin
87ff2c830d 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>
2012-07-17 01:54:32 +02:00
Thiago A. Correa
b8b79a0f37 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>
2012-07-16 23:48:10 +02:00
Kim Motoyoshi Kalland
5762da38b9 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>
2012-07-16 21:36:28 +02:00
Marc Mutz
2718f2e31f QStateMachine: mark a ctor as explicit
Commit 0b66f723f0 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>
2012-07-16 18:34:06 +02:00
Jeremy Katz
aa0319ee17 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>
2012-07-16 18:34:06 +02:00
Jeremy Katz
e22c093a48 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>
2012-07-16 18:34:06 +02:00
Oswald Buddenhagen
311fe0e811 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>
2012-07-16 18:34:06 +02:00
Stephen Kelly
1329a57783 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>
2012-07-16 16:30:55 +02:00
Stephen Kelly
e6abbe68a2 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>
2012-07-16 16:30:55 +02:00
Jeremy Katz
10848dd582 Undocument Qt::AnchorAttribute
AnchorAttribute was removed as part of the Qt3Support cleanup.

Change-Id: I58d8e471d4bc1af420ec8eaab6d34c1718b30382
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-07-16 16:30:55 +02:00
Joerg Bornemann
855bac6368 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>
2012-07-16 16:30:55 +02:00
Friedemann Kleint
a89c7e4020 Replace Q_WS_ in tests by Q_OS_ or check platform names.
Change-Id: Ica445cf1e83bfaab870ac344d6c02766f047a5cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-16 16:30:55 +02:00