Commit Graph

11650 Commits

Author SHA1 Message Date
Oswald Buddenhagen
5b3ebdc26f fix angle sub-target name
Change-Id: I4dc374f96d492f75aee3724eadbd95626fa7a6d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-30 13:50:41 +01:00
Oswald Buddenhagen
d1965abaa1 purge broken line continuation parsing
it would have taken only the last line, which is clearly wrong. as
nobody noticed this, the handling is clearly not needed.

Change-Id: I6f4f45ce8c90cb9b0ef60abbaa5ed49b54d8b47d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-30 13:50:33 +01:00
Morten Johan Sørvig
393fcf69dc Cocoa: prevent scale factor value of 0.
Check that the NSWindow pointer is valid before
calling backingScaleFactor.

Change-Id: Ia23cbb4058b7d0fece008bc437f8bfec6c0ddebe
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-01-30 11:46:40 +01:00
Sze Howe Koh
52a317092e Doc: Fix references to Qt Test
QtTestLib and QTestLib don't exist. The proper name is "QtTest" (code)
or "Qt Test" (English)

http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
http://lists.qt-project.org/pipermail/interest/2012-December/005221.html

Files paths in qttestlib.qdocconf can't be changed easily however, as it
breaks things. So, they're left as they are.

Change-Id: Ifbc44ea858c453bedad8cd7723f847e67fc7a85a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-30 01:35:06 +01:00
Sergio Ahumada
f27b1b8795 test: Add bic data for linux-gcc-amd64
Task-number: QTQAINFRA-321
Change-Id: I449d51088d3e5bfc6f92f036d498a2ef6f7a46b2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2013-01-29 23:34:24 +01:00
Liang Qi
70d38f078e Mac: Ensure the native filedialog sets file name when saving
The name field string was not set in native dialog when one was present.

Task-number: QTBUG-28342
Change-Id: I243b491c8bc094d45f25be96b3bde8eccbb65acd
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-29 16:06:01 +01:00
Liang Qi
2aef22b77a Mac: make windows not restorable on 10.7 and later
The default value for NSWindow::setRestorable: is true, it means
application will have some information for each window stored.
After a crash happened and application relaunched, the application
tries to restore those windows from the broken file. And then the
"Retore Windows" will pop up. There is no workaround for
application users or develoeprs. What they can do is to manually
remove the the saved application state file for the applicaiton.

To avoid that, better to switch it off.

Task-number: QTBUG-28281
Change-Id: I8ce3cd94f5ae81d7877a346743ca4e0e188baa02
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2013-01-29 16:05:54 +01:00
Peter Hartmann
7d757fc8fe QSslSocket tests: use qt-project.org as test server instd of codereview
Change-Id: I1f3a860bf1ab24c30001059b7bcbb19fba7cbc1d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-29 13:00:38 +01:00
Poul Sysolyatin
9d43288180 Exclude BMP from supported formats if it disabled by Qt build
If Qt build without BMP support, we need exclude this format
from output of QImageWriter::supportedImageFormats() and
QImageReader::supportedImageFormats() methods.

Task-number: QTBUG-27028

Change-Id: I44e8956247066c0836b1ff7bf9a1f356fe568af1
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-29 09:28:19 +01:00
Poul Sysolyatin
8995453263 Added 'jpeg' to QImageReader::supportedImageFormats()
When Qt build statically result of
QImageReader::supportedImageFormats() must contain 'jpeg' and
'jpg' if JPEG support enabled.

Task-number: QTBUG-29222

Change-Id: I94d731c2d1e2ede148e2e5261a310a840a1d5523
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-29 09:27:43 +01:00
Sze Howe Koh
d48534302c Doc: Fix description about Qt::UniqueConnection
Qt::UniqueConnection is a flag, not a standalone connection type.

Change-Id: Ibafb7306f3d60753a4381897488131e6484d368f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-01-29 01:53:20 +01:00
Sergio Martins
e02ecba61f Delay initialization of QQnxRootWindow until first access.
QtWebProcess, for example, doesn't create any QWindow, so it doesn't
need any root window.

This fixes Webkit2 rendering on QNX.

Change-Id: I1d4c0dd20869798ba2bcd15f9d96e5fca4beb48e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2013-01-29 01:50:42 +01:00
Thiago Macieira
edd2d9bd0a Make the null pointer dereference a volatile one
This is to ensure that the compiler won't optimise it out of existence.
Clang says it will do it:

testProcessCrash/main.cpp:50:5: warning: indirection of non-volatile null pointer will be deleted, not trap [-Wnull-dereference]
    *(char*)0 = 0;
    ^~~~~~~~~

Change-Id: Iac7771046442f869e205e8789fffdd6443d58e67
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2013-01-29 01:47:01 +01:00
Thiago Macieira
2a3d690a19 Forward-port tests on invalid port numbers from Qt 4
These tests were added to Qt 4 on commit
a17fc85b51a6bdcfa33dcff183d2b7efd667fb92

Task-number: QTBUG-28985
Change-Id: I3cf595384f14272197dcfb85943213c8f8ddeba0
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
2013-01-28 21:07:41 +01:00
Sergio Ahumada
7c38be7e0c Update changes file for 5.0.1 release
Change-Id: If32a0e76606dc887a133fe55dc1154ca512b0218
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-28 20:02:44 +01:00
Kai Koehne
f0c8e63e5b Fix documented signature for QtMessageHandler
Task-number: QTBUG-29352
Change-Id: I46190a59cd73e53e778551a2d33c6b2801e9587e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-01-28 20:02:37 +01:00
Sze Howe Koh
7bb43454b8 Fix minor typos in docs, printed messages & comments
Missing apostrophes

Change-Id: I3ef5e9d494fb7a37f8e6075f24cd3a274e572c23
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 18:12:41 +01:00
Oswald Buddenhagen
f4065db172 fix overquoting of GNUPATH
Task-number: QTBUG-28841
Change-Id: Ifa62a273acefc240953633bbd099384a635f29c6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-28 16:33:48 +01:00
Oswald Buddenhagen
50a416889e explicitly set QMAKE_PKGCONFIG_NAME
otherwise qmake will just take TARGET and lowercase and capitalize it,
which not only looks weird, but also does not match the Requires: fields
we generate.

Change-Id: I4a070ff256fffd2b780acb0361d4213d0032dbb9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-28 16:33:48 +01:00
Oswald Buddenhagen
ca7056ce5b include all module dependencies into pkg-config Requires: field
previously, we'd miss the -private ones (which imply the non-private
version).

Change-Id: Ib5ae2afaa5b5efda9639b7cc4a080432f2fcce2a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-28 16:33:48 +01:00
Sergio Ahumada
2dc99546a1 Fix warnings about files that can't be found in QtConcurrent
Change-Id: I712e3de68bd329fc5e615b08278e719619f856b2
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 16:33:48 +01:00
Sergio Ahumada
03e8824211 testlib: Remove old 'Partner Directory' external link
This reference was removed by dc0d5bf387

Change-Id: I941dbd24815caf7f2f33e757215815d9ca4e581c
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 16:33:48 +01:00
Morten Johan Sørvig
5f71203dd0 Cocoa: export setDockMenu
Change-Id: I1eb35c34427660d2662f310a3e8c4e5ba42e08eb
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-01-28 16:06:15 +01:00
Mark Brand
9ef48277f9 don't prematurely reduce LIBS when adding sql link lists
It's possible that different database libraries share dependencies.
We need to keep their link lists intact here so that QtSql's .prl and
.pc files will have them in the right order. Particularly important
when building the drivers into QtSql and using static linking.

Change-Id: Id371b127099f2790fe7cccd0c7059607600f447d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-28 16:06:15 +01:00
Pasi Petäjäjärvi
f3fc2078b8 Check existence of QProcess feature before using it on Qt autotests.
VxWorks does not have QProcess support.

Change-Id: I917b769f967e9d71ec5025aae788f3e237b07aeb
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from commit 416e73a0fc)
2013-01-28 16:06:15 +01:00
Jerome Pasion
747348f455 Doc: Fixing snippets and input file for a Qt Core article.
-copied snippet and input files from Qt Widgets.
-adapted new paths in the resource-system.qdoc file.
-removed the old path entry in qdocconf.

Task-number: QTBUG-29101
Change-Id: Ieeb118106756a1a39890ab219294de18f437c56c
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-28 14:27:57 +01:00
Sergio Ahumada
f262815f2e Fix some more old references and links to Nokia
Task-number: QTBUG-28156
Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 14:27:57 +01:00
Sze Howe Koh
e778042ed7 Doc, Qt GUI: Fix "no \inmodule command" warnings
Explicitly add "\inmodule QtGui" to Qt GUI classes

Change-Id: Id641c1dc98770fbd994cecc375ca46c01f083236
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 14:07:34 +01:00
Sze Howe Koh
22550ed78d Doc: Fix broken \keyword link
Fix 19 counts of "Can't link to 'default-constructed value'"
warnings.

There was only one link to "default-constructed values", so the
cleanest solution was to change the keyword.

Also included a related typo fix.

Change-Id: I84b47743ecb72a1b2731ef65080fa1e630d478a4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 14:07:34 +01:00
Sze Howe Koh
c9b22e438b Fix unopened comment
Change-Id: I68d131bb29ed4c150ef2630654d2b8ff59ea47cf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 14:07:34 +01:00
Nico Vertriest
223ba7e66a Doc: correct name of file with snippet
Snippet not showing because qdoc read wrong snippet file.
Due to 2 files having the same name.
One was renamed: rsslisting.cpp --> listing.cpp

Task-number: QTBUG-29101
Change-Id: I62b7eee6f2860613ee90538d8dea006b89000317
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 11:49:48 +01:00
Sze Howe Koh
dac925a4d1 Doc: Fix very minor typo
Change-Id: I6af8e81296ef0dc3fcdfd67fae6899bc7c93b206
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 11:31:48 +01:00
Morten Johan Sørvig
0b68fc019b Cocoa: Correct mime handler prioritization.
According to the documentation recently added mime
type converters should take precedence over previously 
added converters. Make it so.

Task-number: QTBUG-25951

Change-Id: Ic23ca7cbb93a98711d762b1ef0e0dd2aa1ceaeda
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-01-28 09:07:00 +01:00
Oswald Buddenhagen
f329dccb79 use correct module names in pkg-config Requires: field
Task-number: QTBUG-29309
Change-Id: Id22d4e2707ceb3421dc6eb5effe16a03c4769d26
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-01-28 07:11:49 +01:00
Thiago Macieira
add16725a3 Don't use the union trick to do unlawful casts
GCC 4.7 is printing this (bogus) warning:
qobject.h:166:15: warning: 'QObject::findChildren(const QString&, Qt::FindChildOptions) const [with T = QMenuBar*; Qt::FindChildOptions = QFlags<Qt::FindChildOption>]::<anonymous union>' declared with greater visibility than the type of its field 'QObject::findChildren(const QString&, Qt::FindChildOptions) const [with T = QMenuBar*; Qt::FindChildOptions = QFlags<Qt::FindChildOption>]::<anonymous union>::typedList' [-Wattributes]

Change-Id: I2d1c365e3191f3a5c7b2241deb35f0ae47d79afc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-01-28 04:02:45 +01:00
Sean Harmer
ff9aa64c99 Remove out-dated duplicate logic from qgl.h
We now use the updated logic for #including the correct GL headers
already implemented in QtGui.

This is needed to fix compilation of QtOpenGL on CentOS 5.8 and
RHEL.

Change-Id: Ifdedd13885566016073538f33aa6daf5902c3497
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-27 10:54:23 +01:00
Sean Harmer
dca90252a7 Prevent GL/gl.h from including system glext.h
This allows us to then use the up-to-date qopenglext.h header on Linux
too. Some distro's are not yet shipping OpenGL 4.x compatible headers.

This fixes compilation of Qt on CentOS 5.8 and RHEL

Change-Id: Ia8022e0aaf215dac7ea2a23dc82c3ac117d9fd53
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-27 10:54:17 +01:00
Topi Reinio
8a0a09f6d1 Doc: Add a note for QDesktopServices about deprecated functions
Add a note in QDesktopServices class reference about storageLocation()
and displayName() functions being deprecated since Qt 5.

Task-number: QTBUG-27869
Change-Id: I739771fef15534823071beabd62aa7b4e7b34cc0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-01-27 10:23:46 +01:00
Topi Reinio
9ccd00703d Doc: Widgets/Tools examples: fix group and missing images
Adds two images missing from Completer example documentation and fixes
typos in \ingroup parameter.

Change-Id: I2a9c1a22c65145dba37b182a82c19f4f0e424ca7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-27 10:21:53 +01:00
Mark Brand
d089ecb711 consolidate generation of metafile install targets
Metafiles such as .prl and .pc files contain paths that have to be
adjusted during installation. The same code is used for unix and
windows so move it into the base class.

Change-Id: I82db89ec83820a4fa0214ba15e7cd63438f6dc91
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-25 23:30:50 +01:00
Rick Stockton
f210a85934 cocoa: Fix Mouse Event tracking of button status
Within qcocoahelpers, make function cocoaButton2QtButton() handle
all button numbers. Within qnsview, call the function in several
places (eliminating duplicate, inefficient code).

Task-number: QTBUG-28567

Change-Id: Ibae2ae4e8a881b825a8862afb82aa80437751111
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
2013-01-25 23:17:58 +01:00
Oleg Shparber
6f1f893493 Fix XCB plugin compilation without accessibility
Change-Id: Ic2bee5b5c20505a866656575b5f5fb853cea4aae
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
2013-01-25 17:34:36 +01:00
Sze Howe Koh
63569a68d2 Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtCore         -> Qt Core
QtDBus         -> Qt D-Bus
QtDesigner     -> Qt Designer
QtGui          -> Qt GUI
QtImageFormats -> Qt Image Formats
QtNetwork      -> Qt Network
QtPrintSupport -> Qt Print Support
QtScript       -> Qt Script
QtSql          -> Qt SQL
QtSvg          -> Qt SVG
QtTest         -> Qt Test
QtWebKit       -> Qt WebKit
QtWidgets      -> Qt Widgets
QtXml          -> Qt XML

QtConcurrent   -> Qt Concurrent (partial)
QtQuick        -> Qt Quick      (partial)

Also, distinguish between "module" and "library"

Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-25 17:27:44 +01:00
Laszlo Papp
e3ac2b6392 Minor QWindow documentation improvement for the accessor/mutators
Change-Id: I003e5dbf1e87fd98cb24c2efdfd39560326f2731
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-25 14:49:32 +01:00
Nico Vertriest
1fbfbf6b6e Doc: corrected path used for snippets.
Added "../../../" to snippet command in gestures.qdoc

Task-number: QTBUG-29101
Change-Id: Ie1d58355f43bcd939f6a178c64ab008b288af747
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-25 13:37:07 +01:00
Nico Vertriest
829ada2129 Doc: added snippet file macmainwindow.mm
Corrected path for snippet command
Now refers to doc\snippets

Removed trailing space

Moved macmaindow.mm to src/widgets/doc/snippets

Task-number: QTBUG-29101

Change-Id: If60c31909b2f5efad10ac8b735164a80522dcf62
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-25 13:37:02 +01:00
Nico Vertriest
d446a4f26d Doc: deleted short paragraph referring to non-existing snippet
Reference to section 1, which does not exist.

Task-number: QTBUG-29101
Change-Id: Ifd5ac58080033ea1d3f0a587f48f9510f24e75b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-25 13:36:57 +01:00
Friedemann Kleint
ff1b65a58c Make QWindowsFontEngineData thread-local.
Task-number: QTBUG-29266

Change-Id: Id963187f1ef03caf4e9ed3c4397225a9ad7362bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-01-25 08:51:10 +01:00
Pasi Petäjäjärvi
05b4000e01 Fixed checking HOME variable return value using isEmpty()
Return value of the QFile::decodeName(qgetenv("HOME")); is never null
if HOME environment variable is not set. So need to check the return
value using isEmpty() instead.

Task-number: QTBUG-28912
Change-Id: Ic57b1978d63e99b056cde35ca8cb9d2a07ff8ce8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-25 08:51:09 +01:00
Debao Zhang
a909dd0ea4 qmake: Don't let an empty $$VERSION cause a garbled version in .rc files
Change-Id: I7f0560979e645da216674cc70c73c5ea9c053aa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-01-25 00:40:40 +01:00