profile/ivi/qtbase.git
11 years agoImproved the paint devices and backends documentation page.
Samuel Rødal [Thu, 22 Nov 2012 08:47:21 +0000 (09:47 +0100)]
Improved the paint devices and backends documentation page.

The image was outdated and didn't really add much information.

Also bring back mention of QWidget here.

Change-Id: I9de95a4ae7eaf0352418bea5732b5e9a763c73c2
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoFixed misspelled dependency in qtgui.qdocconf to fix QtQuick doc links.
Samuel Rødal [Thu, 22 Nov 2012 15:12:33 +0000 (16:12 +0100)]
Fixed misspelled dependency in qtgui.qdocconf to fix QtQuick doc links.

Change-Id: Ia481d0eb643bafd03a353c7a4f40f130607ced29
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQWidgetPrivate::init(): clarify that QWidget requires QApplication
J-P Nurmi [Thu, 22 Nov 2012 11:54:51 +0000 (12:54 +0100)]
QWidgetPrivate::init(): clarify that QWidget requires QApplication

Task-number: QTBUG-28076
Change-Id: Ica9713894c18bb43ae817a6dd42be087b23fa8c2
Reviewed-by: Jing Bai <jing.bai@digia.com>
11 years agoqmake: do not exclusively lock files for reading on Windows/MSVC
Joerg Bornemann [Thu, 22 Nov 2012 10:59:11 +0000 (11:59 +0100)]
qmake: do not exclusively lock files for reading on Windows/MSVC

When sifting through a file to find Q_OBJECT and friends, qmake
was locking it for reading and writing (_SH_DENYRW).
This breaks parallel builds where multiple qmake instances might want
to scan the same file.
Changed the sharing constant to _SH_DENYNO, which doesn't lock the
file at all. This is consistent with the _sopen_s call in findDeps.

Change-Id: I9c0a06db7f580f411e79d9d96dd36a6d705679aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoqdoc: fix urls in manifests after modularization
hjk [Thu, 22 Nov 2012 13:53:18 +0000 (14:53 +0100)]
qdoc: fix urls in manifests after modularization

Change-Id: Ib01062f29139f670894f5496d67ccdfe622b778b
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoMade QWindowsMobileStyle internal
J-P Nurmi [Tue, 20 Nov 2012 12:50:40 +0000 (13:50 +0100)]
Made QWindowsMobileStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsMobileStyle directly.

Change-Id: Id64f3dabff38db7864e235c79b2e9276379f4ba4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoMade QWindowsCEStyle internal
J-P Nurmi [Tue, 20 Nov 2012 12:41:59 +0000 (13:41 +0100)]
Made QWindowsCEStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsCEStyle directly.

Change-Id: I6b3c0554e7a2a4a5f0027f4ea1342fd332af89ad
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoFix transformed text on Mac OS X
Eskil Abrahamsen Blomfeldt [Wed, 21 Nov 2012 08:58:12 +0000 (09:58 +0100)]
Fix transformed text on Mac OS X

In change 1582407fc782c0befd0760633324dd5c206524a1, the Q_WS_MAC
code path which disabled drawing cached glyphs for any transform
was removed, as was the comment that scaling and rotation wasn't
supported by the Mac font engines. This obviously broke transformed
text on Mac, so we need to put it back.

I put it into the font engine itself where it belongs, and I kept
the somewhat confusing naming convention which is used in the
paint engine to minimize this patch. I'll clean up these function
names in a future commit.

Task-number: QTBUG-27362
Change-Id: I4fc6a503eedd4b1ebaf3ee659d948f997f433338
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFixes problem with single precision floats in QDataStream (Windows).
Christian Strømme [Tue, 13 Nov 2012 18:17:17 +0000 (19:17 +0100)]
Fixes problem with single precision floats in QDataStream (Windows).

When the floating-point behavior in MSVC is set to "precise" (default),
assigning nan numbers to a float causes the bit pattern to be altered
(only affects 32bit builds). We should therefore not assign the swapped
value back to a float and use it.

Task-number: QTBUG-25950

Change-Id: I7b6cc4d546e5c8aeafdede749056358b7d639ec7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoAdd WindowFullscreenButtonHint.
Morten Johan Sørvig [Mon, 5 Nov 2012 21:20:47 +0000 (22:20 +0100)]
Add WindowFullscreenButtonHint.

Adds the fullscreen button on Mac OS X. Has no effect
on other platforms. Regarding the name I dropped the
"Mac" prefix (like MacWindowToolBarButtonHint). Other
platforms can use and we don't want to accumulate "Mac"
API's.

Change logic in QCocoaWindow check for this flag instead
of using WindowsMaximizebutton.

Change-Id: I9f2db75e8e71b3da36777c7e48852eda3ce9d534
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoAccessibility Mac: Return textArea as role for multi line text.
Frederik Gladhorn [Thu, 15 Nov 2012 16:01:15 +0000 (17:01 +0100)]
Accessibility Mac: Return textArea as role for multi line text.

Change-Id: I88eb4746463b7372c2dfe089ba74ea4cb0098396
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccessibility: set multiline state for text edits.
Frederik Gladhorn [Thu, 15 Nov 2012 16:06:50 +0000 (17:06 +0100)]
Accessibility: set multiline state for text edits.

Change-Id: I22d3baac8fc57db0c89d8543019a93263b2023ca
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccount for the item spacing when using QListView::scrollTo()
Pierre Rossi [Mon, 19 Nov 2012 20:15:19 +0000 (21:15 +0100)]
Account for the item spacing when using QListView::scrollTo()

Somehow this bug managed to stay hidden until the introduction
of QFusionStyle.

Task-number: QTBUG-27675
Change-Id: I86b049b869e9f2951426dc67a485ad7c60ef1403
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoReturn something from QPAEventDispatcherGlib::processEvents
hjk [Thu, 22 Nov 2012 08:33:33 +0000 (09:33 +0100)]
Return something from QPAEventDispatcherGlib::processEvents

Change-Id: I0abaf73d4b6b96dbcf499ea86749ced76348c281
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoGet rid of deprecated functionality in QtOpenGL.
Samuel Rødal [Thu, 22 Nov 2012 07:35:48 +0000 (08:35 +0100)]
Get rid of deprecated functionality in QtOpenGL.

We will in any case not be able to support this in Qt 5, so best to just
remove it to not give any false impressions.

Change-Id: Ib52e86007b9e6483bd973f13502b078792a9fa40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix drops from external sources.
Gatis Paeglis [Thu, 11 Oct 2012 13:29:40 +0000 (15:29 +0200)]
Fix drops from external sources.

Task-number: QTBUG-26832

Change-Id: Ia1ccce391178e73d26a4f09955bce6c37616384f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoPass extended key event infomation in xcb platform.
Weng Xuetian [Sun, 24 Jun 2012 05:04:44 +0000 (13:04 +0800)]
Pass extended key event infomation in xcb platform.

Bare QKeyEvent missing some useful info for input method.
Use new construct of QKeyEvent to create extended QKeyEvent

Change-Id: I8c89e80e7329b92e3e04d5fe52d07c6f6f9e006f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQtPrintSupport: use CUPS defaults for UNIX print dialog
Teemu Katajisto [Wed, 22 Aug 2012 09:09:21 +0000 (12:09 +0300)]
QtPrintSupport: use CUPS defaults for UNIX print dialog

Update printer defaults in UNIX print dialog when printer
is changed.

Task-number: QTBUG-23037
Task-number: QTBUG-6239
Task-number: QTBUG-15351
Task-number: QTBUG-19233
Task-number: QTBUG-22036

Change-Id: Ib03635035211bd69b5b23da20ffd2c03ac318a1a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQtPrintSupport: remove advanced tab from UNIX print properties dialog
Teemu Katajisto [Mon, 13 Aug 2012 08:47:32 +0000 (11:47 +0300)]
QtPrintSupport: remove advanced tab from UNIX print properties dialog

The Advanced tab shows CUPS options and duplicates some of the settings
in Page tab. These duplicate settings cannot be kept in synchronization
and thus the Advanced tab causes confusion which settings are used.

Remove the Advanced tab because the same settings are either available
in Page tab or can be configured in system printer settings.

Change-Id: I2dc2bf8b3b84dd19f24b2e6c1c9539c925d5d725
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoCocoa: Properly set QNSView's geometry when it's a subview
Gabriel de Dietrich [Thu, 22 Nov 2012 14:56:48 +0000 (15:56 +0100)]
Cocoa: Properly set QNSView's geometry when it's a subview

Task-number: QTBUG-26960
Change-Id: Ib8ca76572c868305f378d22c21d13511b4999244
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agotst_QMetaProperty doesn't need QtGui
Marc Mutz [Thu, 22 Nov 2012 10:12:54 +0000 (11:12 +0100)]
tst_QMetaProperty doesn't need QtGui

Change-Id: Id286827f692b7c49436ae8247f49eff993a47bdc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agobootstrapped tools don't need env var setup
Oswald Buddenhagen [Thu, 22 Nov 2012 12:46:37 +0000 (13:46 +0100)]
bootstrapped tools don't need env var setup

Change-Id: I15d818d3ca24d426e492ea9d3a423f661b3ccf3b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDo not hide fullscreen widgets having a 0x0 geometry
Oliver Wolff [Thu, 22 Nov 2012 08:44:33 +0000 (09:44 +0100)]
Do not hide fullscreen widgets having a 0x0 geometry

It is possible that the widget which is to be shown full screen has a
0x0 geometry if an empty layout with 0 margin is set there. In that case
the widget should not be hidden.

Task-number: QTBUG-27602

Change-Id: I87fd20cc3a5bac89ceccdf639780c4bc721ce860
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoMade renderText() work in samplebuffers example.
Samuel Rødal [Thu, 22 Nov 2012 08:12:54 +0000 (09:12 +0100)]
Made renderText() work in samplebuffers example.

Since the OpenGL paint engine is now OpenGL 2.0 based, we need to save
and restore all GL state to prevent it from being clobbered.

Task-number: QTBUG-27020
Change-Id: I39831e074aa818583df34c4a88b13be559d0231b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoQtBase: examples/widgets/itemviews code style
David Schulz [Thu, 22 Nov 2012 12:40:51 +0000 (13:40 +0100)]
QtBase: examples/widgets/itemviews code style

Change-Id: I78a7745f7dc3add3fd7780220118d1b35b50a941
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoDoc: Modified Qt Test's doc configuration to match file and dir names.
Jerome Pasion [Wed, 21 Nov 2012 12:03:05 +0000 (13:03 +0100)]
Doc: Modified Qt Test's doc configuration to match file and dir names.

-"qttestlib" should be the directory to match the name of the .index
file. The names affect the cross linking and the "depends" variable.

Change-Id: Ibd35e7a089c78c043527bd72741e57d72daa83d8
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
11 years agoAdd support for getaddrinfo using MinGW in tst_qhostinfo
Jonathan Liu [Wed, 21 Nov 2012 10:37:03 +0000 (21:37 +1100)]
Add support for getaddrinfo using MinGW in tst_qhostinfo

Change-Id: Ief9ddd22171ec2b852ca504957e0e11b90badccb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQtBase: examples/widgets/itemviews/addressbook codestyle
David Schulz [Wed, 21 Nov 2012 14:45:13 +0000 (15:45 +0100)]
QtBase: examples/widgets/itemviews/addressbook codestyle

Change-Id: I710d67018351c34ef14ac30edcca81aba7ff5ad3
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAdd QMimeType::aliases().
David Faure [Mon, 19 Nov 2012 16:14:02 +0000 (17:14 +0100)]
Add QMimeType::aliases().

Requested by Allan Sandfeld Jensen for QWebkit, which needs to register
upfront all the mimetypes that a given plugin can handle.

Change-Id: I64b8d39c7988adfc7db4ed8bfdc73acd16e999da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoUse QT_STRINGIFY in qobjectdefs.h
Olivier Goffart [Wed, 21 Nov 2012 15:30:14 +0000 (16:30 +0100)]
Use QT_STRINGIFY in qobjectdefs.h

Since it is declared in qglobal.h, we do not need to re-implement the
hack here.

QTOSTRING was only defined if QT_NO_META_MACROS was defined, so
practically not safe to use in other places.

Change-Id: Ie5b07d0fa7537ba79380b882a4c822583ee5635e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoUnbreak the bootstrap lib build on MinGW
Konstantin Ritt [Tue, 20 Nov 2012 16:27:59 +0000 (18:27 +0200)]
Unbreak the bootstrap lib build on MinGW

With -std=c++0x, MinGW headers doesn't declare some common functions
we're using in qglobal.cpp.

Change-Id: I0ba68ee73b1099c8591a578f06f58db316631e8e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoBlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
mfekari [Wed, 21 Nov 2012 16:12:12 +0000 (11:12 -0500)]
BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX

Change-Id: I87708aad18ebe1c6a08fe89376290be66f9c0577
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
11 years agoRemove warnings from qtbase.
Mitch Curtis [Tue, 20 Nov 2012 13:57:16 +0000 (14:57 +0100)]
Remove warnings from qtbase.

geometryengine.cpp: In member function 'void
GeometryEngine::drawCubeGeometry(QGLShaderProgram*)':
geometryengine.cpp:159:93:  warning: cast to pointer from integer of
different sie [-Wint-to-pointer-cast] geometryengine.cpp:167:95:
warning: cast to pointer f rom integer ofdifferent size
[-Wint-to-pointer-cast]
benchmarking.cpp: In member function 'void TestBenchmark::multiple()':
benchmarking.cpp:85:9: warning: variable 'result' set but not used
[-Wunused-but-set-variable]
benchmarking.cpp: In member function 'void TestBenchmark::series()':
benchmarking.cpp:120:9: warning: variable 'result' set but not used
[-Wunused-but-set-variable]
qstandarditemmodel.cpp:2717:45: warning: unused variable 'd'
[-Wunused-variable]
qxcbconnection.cpp: In member function 'xcb_timestamp_t
QXcbConnection::getTimestamp()': qxcbconnection.cpp:930:40: warning:
suggest  parentheses around assignment used as truth value
[-Wparentheses]
tst_qguiapplication.cpp: In constructor
'BlockableWindow::BlockableWindow()':  tst_qguiapplication.cpp:340:9:
warning:'BlockableWindow::enters' will be initialized after [-Wreorder]
tst_qguia pplication.cpp:339:9: warning 'int BlockableWindow::leaves'
[-Wreorder] tst_qguiapplication.cpp:342:12:  waring: when initialized
here [-Wreorder]
tst_qsqltablemodel.cpp:570:10: warning: unused parameter 'value'
[-Wunused-parameter]
tst_qabstractitemview.cpp:1546:8: warning: unused parameter 'index'
[-Wunused-parameter]

Change-Id: I49c88547182e4669cfde2c2536403fc5573ca2da
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoUpdate Qlocale data up to CLDR 22.1
Konstantin Ritt [Wed, 21 Nov 2012 13:53:33 +0000 (15:53 +0200)]
Update Qlocale data up to CLDR 22.1

Change-Id: Ie6ddfec14cb052e0b89230dc93290ff79488fb25
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoUpdate Qlocale data up to CLDR 2.0.1
Konstantin Ritt [Wed, 21 Nov 2012 03:56:21 +0000 (05:56 +0200)]
Update Qlocale data up to CLDR 2.0.1

Change-Id: I4279fac57436d7009a6d61dab5936b72fd39fc14
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoUse likelySubtags to instantiate a locale id from it's short form
Konstantin Ritt [Wed, 21 Nov 2012 04:08:24 +0000 (06:08 +0200)]
Use likelySubtags to instantiate a locale id from it's short form

...just like described in http://www.unicode.org/reports/tr35/#Likely_Subtags.
This is much more effective than current "guessing" algorithm
+ makes it possible to instantiate a locale by the script or territory code only.

Change-Id: I674f8476e65b01c56960b6e83a1a346df0715274
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years ago[SIC/BIC] QLocale: update enums up to CLRD 1.9.1
Konstantin Ritt [Wed, 21 Nov 2012 13:45:18 +0000 (15:45 +0200)]
[SIC/BIC] QLocale: update enums up to CLRD 1.9.1

This patch adds some missing codes (two-letter ones only),
removes an outdated ones, and updates some names.
The legacy language codes are handled in QLocalePrivate::codeToLanguage()
(fortunately, there are only 4 of such codes).

Change-Id: Iff50aecd1c762b6399cd151aebb955f341d366c6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQHeaderView - call viewport->update() in setDefaultSectionSize
Thorbjørn Lund Martsum [Mon, 12 Nov 2012 12:46:46 +0000 (13:46 +0100)]
QHeaderView - call viewport->update() in setDefaultSectionSize

Just like in resizeSection, moveSection, swapSection (and more)
we should call update on the viewport after setDefaultSectionSize.

Change-Id: I88154138d98f644050054d7cd287a0addd9a9cf9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoQHeaderView::setDefaultSectionSize to handle auto size of sections.
Thorbjørn Lund Martsum [Mon, 12 Nov 2012 12:37:04 +0000 (13:37 +0100)]
QHeaderView::setDefaultSectionSize to handle auto size of sections.

setDefaultSectionSize should respect auto resized sections like
QHeaderView::resizeSection(). When setDefaultSectionSize is called
we should process a possible pending resize and afterwards we
should do a (delayed) resize of the sections (if we have autosized
sections)

Change-Id: Ie09e6f073c944b58693ffbbd1d1a8b60104c1a55
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoRename DBus landing page according to rules.
Frederik Gladhorn [Wed, 21 Nov 2012 14:39:03 +0000 (15:39 +0100)]
Rename DBus landing page according to rules.

Change-Id: Idf26f89f41940c4883cbbe99b3cdd868d0d36b06
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQHeaderView:setDefaultSectionSize add invalidateCachedSizeHint call
Thorbjørn Lund Martsum [Mon, 12 Nov 2012 05:48:34 +0000 (06:48 +0100)]
QHeaderView:setDefaultSectionSize add invalidateCachedSizeHint call

We cannot rely on the previous sizeHint and we also call it
in QHeaderView::resizeSection(). There seems to be no reason
not to call it.

Change-Id: Ia473fb7163369aafa5c019ff97a030f9f54a33d9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agouic - fix to handle QTreeWidget with empty header(s)
Thorbjørn Lund Martsum [Mon, 19 Nov 2012 14:17:27 +0000 (15:17 +0100)]
uic - fix to handle QTreeWidget with empty header(s)

This makes it possible for uic to handle QTreeWidget that in
the designer has one or more empty headers.

Before the right(most) empty items where there wasn't a
non-empty header to the right of them would not be visible.

The other empty items - where there was a header to the
right of it would not be empty but initialized with a number.

This patch ensures the same behavior that the QTableWidget
is having.

Task-number: QTBUG-18156

Change-Id: I19bfd3307befe46a1af2d6a3275f7446a15b3442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoMark QDBusConnectionInterface::serviceOwnerChanged as deprecated.
Mitch Curtis [Mon, 19 Nov 2012 16:31:28 +0000 (17:31 +0100)]
Mark QDBusConnectionInterface::serviceOwnerChanged as deprecated.

It warns that it is deprecated if used, but it is currently not marked
as such.

Task-number: QTBUG-28082

Change-Id: Ib0bf034c188650ae77eb5550769e032490d19783
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agopackagesExist(): always return false if QT_CONFIG contains no-pkg-config
Milian Wolff [Mon, 19 Nov 2012 14:53:57 +0000 (15:53 +0100)]
packagesExist(): always return false if QT_CONFIG contains no-pkg-config

On QNX e.g. you'll end up with a Qt configured without pkg-config support
by default. Once you try to compile e.g. QtWebKit which contains a check
like packagesExist(libudev) the system pkg-config (see default branch
of pkgConfigExecutable) will be called without any special config sysroot
or libdir. Thus libudev will be found in your system host, even though
it is not available for the cross compile target. This leads to compile
errors as described in https://bugs.webkit.org/show_bug.cgi?id=98032 .

Change-Id: If1474cb3b3f3b71fad7269e4aedd4e10f70a9b2a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoClean up diagramscene example's toolbutton icons.
Mitch Curtis [Mon, 19 Nov 2012 15:52:47 +0000 (16:52 +0100)]
Clean up diagramscene example's toolbutton icons.

Remove artefacts from pointer.png.

Replace several PNGs with images without artefacts (used FreeSerif as
the font).

Stopped scaling images up in MainWindow::createColorToolButtonIcon.

Change-Id: I7adf2deea73b89c631d39d575804e8d3f58c9fe1
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoFix building of examples.
Friedemann Kleint [Wed, 21 Nov 2012 13:04:34 +0000 (14:04 +0100)]
Fix building of examples.

- Correct install path of widget examples to contain widgets
  directory in target tree.
- Add missing resources.

Task-number: QTBUG-27977

Change-Id: If4cb117998892b0b165d7678367553d3a7553b91
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
11 years ago[Doc cleanup] Fix typos and style of QAbstractButton, QButtonGroup, QCheckBox and...
David Gil [Mon, 15 Oct 2012 16:34:31 +0000 (18:34 +0200)]
[Doc cleanup] Fix typos and style of QAbstractButton, QButtonGroup, QCheckBox and QRadioButton

Change-Id: Ie557f865f5bdec7241abced91bf10cee8feaf9d9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoEnable gui build with QT_NO_SYSTEMTRAYICON
Tasuku Suzuki [Wed, 21 Nov 2012 04:24:20 +0000 (13:24 +0900)]
Enable gui build with QT_NO_SYSTEMTRAYICON

Task-number: QTBUG-24816
Change-Id: I5b53392bee3990ec5c7235cc615b4a477fb62089
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoAccessibility: unhide text() function in TextWidget subclasses.
Frederik Gladhorn [Thu, 15 Nov 2012 16:19:03 +0000 (17:19 +0100)]
Accessibility: unhide text() function in TextWidget subclasses.

Change-Id: Ib5a64ff8de175d1ffc6e4357ec9ec45c4c2f2917
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoMade QWindowsXPStyle internal
J-P Nurmi [Fri, 16 Nov 2012 16:22:40 +0000 (17:22 +0100)]
Made QWindowsXPStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy and even merging style
implementations (XP & Vista) later on, without worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsXPStyle directly.

Change-Id: Ib4fec35c2fcb3b5a193537a1de5b6e26fbbe0a06
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoMade QWindowsVistaStyle internal
J-P Nurmi [Fri, 16 Nov 2012 15:54:43 +0000 (16:54 +0100)]
Made QWindowsVistaStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy and even merging style
implementations (XP & Vista) later on, without worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsVistaStyle directly.

Change-Id: I8b320036e241e877fc9bb5f4084cc6e63756cbc4
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoBlackBerry: Changed QSettings file access
Bernd Weimer [Fri, 16 Nov 2012 10:35:35 +0000 (11:35 +0100)]
BlackBerry: Changed QSettings file access

On the BlackBerry platform, applications run in a sandbox. They are
not allowed to read or write outside of this sandbox. Hence in
QSettings there is no use for the system scope and differentiating
between organization and application. This change will also improve
performance.

Change-Id: I79fee0140595385f3d33bd89fe5daa36b04836bc
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
11 years agoBlackBerry: Restore proper BPS channel in event dispatcher
Bernd Weimer [Tue, 20 Nov 2012 13:44:34 +0000 (14:44 +0100)]
BlackBerry: Restore proper BPS channel in event dispatcher

This change ensures that BPS events are delivered to the proper
channel even if the application code would change the channel.

Change-Id: Id44efbdd99350c639e391161dd89b8d422c4b330
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Jeff Kehres <jkehres@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoQtBase: examples/widgets/layouts coding style
David Schulz [Wed, 21 Nov 2012 13:14:38 +0000 (14:14 +0100)]
QtBase: examples/widgets/layouts coding style

Change-Id: I4340c1fcbb467bf3c2ace3b4bd4b042fe9521c35
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoHandle QEventLoop::ExcludeUserInputEvents in QWindowSystemInterface.
Friedemann Kleint [Tue, 20 Nov 2012 15:53:27 +0000 (16:53 +0100)]
Handle QEventLoop::ExcludeUserInputEvents in QWindowSystemInterface.

Add a flag indicating user input events to the event type and
leave those events in the queue if
QEventLoop::ExcludeUserInputEvents is set.

Task-number: QTBUG-27595
Change-Id: Ib41b826ef3be19253cd582d9894dd7c87953711f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoProperly initialize glViewport() to appropriate value in QGLPixelBuffer.
Samuel Rødal [Wed, 21 Nov 2012 13:32:30 +0000 (14:32 +0100)]
Properly initialize glViewport() to appropriate value in QGLPixelBuffer.

Since we are using a hidden window in order to make the context current,
the viewport will end up with an arbitrary value. By setting it
explicitly we ensure compatibility with Qt 4.

Task-number: QTBUG-28115
Change-Id: I69fb5efda2b274b539c3d3b9fa842a2d32ad70b1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoMac: fix invalid context in imageForGlyph
Teemu Katajisto [Fri, 12 Oct 2012 07:58:38 +0000 (10:58 +0300)]
Mac: fix invalid context in imageForGlyph

The bounding rectangle may have negative width or height when a
graphics view with text is rotated in certain angles. Make
sure that the image width and height are positive, otherwise the
context will be null and the following messages can be seen in
test logs:
<Error>: CGContextSetFontSize: invalid context 0x0

Change-Id: I10f83f6909035fb3c4ac456123cf1922eaea7c73
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix MinGW compilation for tst_qwinoverlappedionotifier
Jonathan Liu [Wed, 21 Nov 2012 10:24:04 +0000 (21:24 +1100)]
Fix MinGW compilation for tst_qwinoverlappedionotifier

Change-Id: I664761e7e6fd1c00067ae1def496ba4974e539be
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQNX: Fix crash due to re-entering QToolTip::show().
Sergio Martins [Wed, 21 Nov 2012 09:52:05 +0000 (09:52 +0000)]
QNX: Fix crash due to re-entering QToolTip::show().

The flushWindowSystemEvents() was added to send the geometry
event synchronously. A side effect was that all input events were
also sent.

We don't want that. We're probably in setGeometry() because some
other input event brought us here, and it's still in the call
stack.

One crashy example is the static method QToolTip::show() which
uses static variables([1]). If we process input events while the
first QToolTip::show() is still on the call stack, it will trigger
a second one, deleting stuff ([1]) that the first invocation will
still need once the stack unwinds.

Change-Id: Iea22419a7f386d6b6231404666092340dfd1afed
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoqdoc: Make image paths relative to html file
Martin Smith [Tue, 20 Nov 2012 12:19:12 +0000 (13:19 +0100)]
qdoc: Make image paths relative to html file

Task-number: QTBUG-28080

Change-Id: Ie552cacdf736f9f6da3148a11ef2362248775e1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Various modifications to the online and offline stylesheets.
Jerome Pasion [Tue, 20 Nov 2012 14:55:17 +0000 (15:55 +0100)]
Doc: Various modifications to the online and offline stylesheets.

-used Qt Project colors
-changed margins and paddings

Change-Id: If7a533ac3a32debbaca7b403aa68290c2b9aab2c
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoMade QFusionStyle internal
J-P Nurmi [Fri, 16 Nov 2012 16:39:24 +0000 (17:39 +0100)]
Made QFusionStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QFusionStyle directly.

Change-Id: I37d8acb13b6fd328a9cd53c74df971428bbbe443
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix possible crash/assertion in qt_fontHasNarrowOutlines()
Konstantin Ritt [Fri, 16 Nov 2012 18:44:12 +0000 (20:44 +0200)]
Fix possible crash/assertion in qt_fontHasNarrowOutlines()

1. cloneWithSize() may return 0
1bis. QRawFont::setPixelSize() may ivalidate the font (due to 1.)
2. using the data obtained from a temporary QString is never safe!

Change-Id: I0cd5f807d8077ef5112704e475f1904bd6fc4b1b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQPAEventDispatcherGlib: Use correct flags when sending events
Oliver Wolff [Tue, 20 Nov 2012 17:04:42 +0000 (18:04 +0100)]
QPAEventDispatcherGlib: Use correct flags when sending events

Instead of assuming that all events should be handled when
a user event occurs, userEventSourceDispatch has to use the
flags used in QPAEventDispatcherGlib::processEvents.

Task-number: QTBUG-27595
Change-Id: Ib13607f89f7d3207ec83ab26f7d59b3c59a28c4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoSIC QPrintSupport: Remove unused PPK_SuppressSystemPrintStatus
John Layt [Sun, 29 Jul 2012 16:41:08 +0000 (17:41 +0100)]
SIC QPrintSupport: Remove unused PPK_SuppressSystemPrintStatus

Print Engine key PPK_SuppressSystemPrintStatus was added in Qt4.1
for Cocoa dialog to suppress the progress dialog.  In Qt5 all cocoa
code has been removed and this key is now unused.

Change-Id: I3a91e9651e16f81611a9a736163f76acf9f20096
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoPatch file for ANGLE for fixing blackscreen after minimize
Miikka Heikkinen [Wed, 21 Nov 2012 07:34:13 +0000 (09:34 +0200)]
Patch file for ANGLE for fixing blackscreen after minimize

Task-number: QTBUG-27994

Change-Id: Iee3d9ff992b0d99c9d1ec3f13631c137114a52a9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQJpegHandler: err should be set before jpeg_create_decompress()
Elvis Lee [Tue, 20 Nov 2012 00:11:35 +0000 (09:11 +0900)]
QJpegHandler: err should be set before jpeg_create_decompress()

If ERREXIT2 is called in jpeg_create_decompress(), SIGSEGV occurs with
no error message. ERREXIT2 macro uses jpeg_compress_struct.err to handle
error case.

Change-Id: I8517a4d6f6e6aa4c1c59cd1aaea435554cca7ac3
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoQnx: Handle the MeasurementSystem value in QNX
mfekari [Mon, 29 Oct 2012 13:41:09 +0000 (09:41 -0400)]
Qnx: Handle the MeasurementSystem value in QNX

Change-Id: I00837421431d82aa831b785d3effb0920b4541f3
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix regression in QXmlStreamWriter with codec set to UTF-16
Jan Arve Saether [Tue, 20 Nov 2012 10:11:44 +0000 (11:11 +0100)]
Fix regression in QXmlStreamWriter with codec set to UTF-16

Actually, this broke using QXmlStreamWriter with any codec
where characters in the ASCII range have a different encoding
than the ASCII standard.

This was a regression from 558fe9383ba0aecbec09cc411c0ebab132aac137

Task-number: QTBUG-23310

Change-Id: I75bd013e9d5de53da564a76c2f06e95ff35303a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoQProxyStyle: fix the base style assignment in constructor
J-P Nurmi [Tue, 20 Nov 2012 13:55:20 +0000 (14:55 +0100)]
QProxyStyle: fix the base style assignment in constructor

Assign the baseStyle member before calling setParent(), because that
will trigger ParentChange event and thus calls ensureBaseStyle(). The
baseStyle member must be set at that point, because otherwise it will
start creating a fallback base style.

Change-Id: I3522e41bb6b82e3fe2e7790d53a53978c18a027a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoDetect Unity by checking XDG_CURRENT_DESKTOP and use Gnome theme.
Friedemann Kleint [Tue, 20 Nov 2012 08:13:50 +0000 (09:13 +0100)]
Detect Unity by checking XDG_CURRENT_DESKTOP and use Gnome theme.

Fallback to Gtk for unknown desktops, which should be suitable
for most cases like XFCE.

Task-number: QTCREATORBUG-8254

Change-Id: Iaf9959f75852e03a83b5af7d0dead01ef657d678
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agodon't run syncqt three times in debug_and_release configs
Oswald Buddenhagen [Wed, 7 Nov 2012 14:59:25 +0000 (15:59 +0100)]
don't run syncqt three times in debug_and_release configs

Change-Id: Ifdf7727444779ffa79d9f2ec908d24d1e0663c21
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agodon't set CONFIG+=release during build passes
Oswald Buddenhagen [Mon, 19 Nov 2012 16:19:12 +0000 (17:19 +0100)]
don't set CONFIG+=release during build passes

otherwise we get inconsistent builds.

Task-number: QTBUG-28046
Change-Id: I7952000bfc8e02ced5fd2c1bbffab7384f2730c1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix black screen after minimizing OpenGL window with ANGLE
Miikka Heikkinen [Tue, 20 Nov 2012 11:23:27 +0000 (13:23 +0200)]
Fix black screen after minimizing OpenGL window with ANGLE

CreateTexture will fail on zero dimensions, so just release old target
and reset dimensions when resetSwapChain is called with zero size area.

Task-number: QTBUG-27994
Change-Id: I1e500c4fd4b92f7d9ea2a49a44f3fb930b575cd1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFixed rendering artifacts when drawing cursor.
Samuel Rødal [Tue, 20 Nov 2012 11:46:04 +0000 (12:46 +0100)]
Fixed rendering artifacts when drawing cursor.

Get rid of the + 1 in addition to the ascent and descent.

Task-number: QTBUG-27658
Change-Id: I8721226a034099ebe348cad3c49ac711c7fe44b9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQHeaderView - do not keep indexes from an obsolete model
Thorbjørn Lund Martsum [Thu, 8 Nov 2012 14:09:00 +0000 (15:09 +0100)]
QHeaderView - do not keep indexes from an obsolete model

When we call setModel persistentHiddenSections are no longer relevant.
It contains indexes from the previous model.

This solves:

Task-number: QTBUG-18196

Change-Id: Ida02fa63a915695e3730fd63995ac5f8520ae827
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoMade QGtkStyle internal
J-P Nurmi [Fri, 16 Nov 2012 13:33:46 +0000 (14:33 +0100)]
Made QGtkStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example some styles could be even separated out of QtWidgets and be
provided as plugins instead.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QGtkStyle directly.

Change-Id: Iea1f7ebc80949d29f02733f81674355578e2e4fc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoexclude 3rdparty from lupdate
Oswald Buddenhagen [Mon, 19 Nov 2012 11:40:10 +0000 (12:40 +0100)]
exclude 3rdparty from lupdate

Change-Id: I00c569787943a87dda60786b179af1f55a94ea68
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agocreate interface QSqlDriver::cancelQuery()
Sune Vuorela [Fri, 16 Nov 2012 12:19:05 +0000 (13:19 +0100)]
create interface QSqlDriver::cancelQuery()

This is useful for canceling a long running sql query.
Note that it needs support from the individual drivers.

Change-Id: Ia170a70487ff4ee13c85f12bc13e62fb198617fe
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoHandle Qt::WA_MacSmallSize in QApplication::font(const QWidget *).
Friedemann Kleint [Mon, 19 Nov 2012 13:57:11 +0000 (14:57 +0100)]
Handle Qt::WA_MacSmallSize in QApplication::font(const QWidget *).

Task-number: QTBUG-27669
Task-number: QTBUG-27665
Change-Id: Id7eb8092076a57a755a53d1eb5c46d706756ca81
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoMerge "Merge branch 'newdocs'" into refs/staging/master
Samuel Rødal [Tue, 20 Nov 2012 11:16:16 +0000 (12:16 +0100)]
Merge "Merge branch 'newdocs'" into refs/staging/master

11 years agoQMimeDatabase: remove deprecated API
David Faure [Mon, 19 Nov 2012 13:54:37 +0000 (14:54 +0100)]
QMimeDatabase: remove deprecated API

c241d8921ea6384c30a1731a036aec8edc7609ab renamed the methods but kept
the old ones "for a week or two" at Thiago's request.

Change-Id: I0747c032b549e45f6c8201db577d84863f39f599
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoMerge branch 'newdocs'
Eskil Abrahamsen Blomfeldt [Tue, 20 Nov 2012 09:08:29 +0000 (10:08 +0100)]
Merge branch 'newdocs'

Added prepare_docs to qt_build_config.prf (it was added
directly in configure in the source branch)

Conflicts:
configure
tools/configure/configureapp.cpp

Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8

11 years agoAdded doc with IO functions
Nico Vertriest [Tue, 30 Oct 2012 14:22:38 +0000 (15:22 +0100)]
Added doc with IO functions

Minor spelling and editorial issues
see remarks J.Pasion 30 Oct.

Corrected syllabifying error and minor punctuation issue

Added link to Qt Core in introduction

Change-Id: I1516c94c7f9b70125801ab7f9dfeeaed94db6d91
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Changing titles in HTML template.
Jerome Pasion [Mon, 19 Nov 2012 16:22:05 +0000 (17:22 +0100)]
Doc: Changing titles in HTML template.

-Easier to differentiate the links.

Change-Id: I9294affcdbf037d91d94fa707449d78fac01bcbb
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoUse setImage workaround on all OS X versions.
Morten Johan Sørvig [Fri, 16 Nov 2012 06:09:03 +0000 (07:09 +0100)]
Use setImage workaround on all OS X versions.

The painting bug that we are working around/fixing
here has been observed on 10.7 as well.

Change-Id: Ic29421bcc84405afa085af2f0ed2bc554c684f98
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoSQL: Fix OCI driver's compile errors.
Caroline Chao [Thu, 15 Nov 2012 08:58:32 +0000 (09:58 +0100)]
SQL: Fix OCI driver's compile errors.

Task-number: QTBUG-27979

Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoFixed memory leak in assign operator of QGLBuffer
Vadim Zakondyrin [Sat, 17 Nov 2012 03:39:14 +0000 (10:39 +0700)]
Fixed memory leak in assign operator of QGLBuffer

Change-Id: Icb51dd5a567483b415ab0e8af9eb62221225890d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFixed memory leak in assign operator of QOpenGLBuffer
Vadim Zakondyrin [Sat, 17 Nov 2012 03:10:51 +0000 (10:10 +0700)]
Fixed memory leak in assign operator of QOpenGLBuffer

Change-Id: I47f9128b54770bae7a63f82bf66ca16144b67c55
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQLocale: replace hard-coded default country-for-language map
Konstantin Ritt [Mon, 19 Nov 2012 17:12:58 +0000 (19:12 +0200)]
QLocale: replace hard-coded default country-for-language map

...with a generated one in a way similar to what
http://www.unicode.org/reports/tr35/#Likely_Subtags suggests.
The supplemental/likelySubtags.xml contains all the required data.
This changes some default countries to a most-expected ones.

Change-Id: I920a5623601d8661a943e78197d3bcc838191483
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDocument what the QMimeDatabase constructor really does.
David Faure [Mon, 19 Nov 2012 13:10:33 +0000 (14:10 +0100)]
Document what the QMimeDatabase constructor really does.

Change-Id: I8d4dcc92296163dea7b78fbb0ceefaee08e57a94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Allan Sandfeld Jensen <kde@carewolf.com>
11 years agoQSystemTrayIcon/X11: Use display obtained as native screen resource.
Friedemann Kleint [Mon, 19 Nov 2012 12:37:45 +0000 (13:37 +0100)]
QSystemTrayIcon/X11: Use display obtained as native screen resource.

Previously, the screen name was used, which contained the
display name. This was changed to return the xrandr-name.

Task-number: QTBUG-5416
Change-Id: I560143d6d459a8051c9640079cf7d39a3caebfec
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAdd QPlatformNativeInterface::nativeResourceForScreen().
Friedemann Kleint [Mon, 19 Nov 2012 12:36:30 +0000 (13:36 +0100)]
Add QPlatformNativeInterface::nativeResourceForScreen().

Task-number: QTBUG-5416
Change-Id: Ic163a5ff1c7a06869d324acb9aa7c257a0262e72
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoDoc: Adding subtitle to the online snapshot HTML
Jerome Pasion [Mon, 19 Nov 2012 14:37:21 +0000 (15:37 +0100)]
Doc: Adding subtitle to the online snapshot HTML

-other fixes to the HTML template.

Change-Id: I85070c615796c4342a89cc730ab2ca8ab51dd5e6
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoAdd a new location for QML 2.x imports
Thiago Macieira [Mon, 15 Oct 2012 20:23:13 +0000 (13:23 -0700)]
Add a new location for QML 2.x imports

This commits adds a -qmldir configuration option for the configures to
allow the user to change the default location (it defaults to
$archdatadir/qml).

It adds a QLibraryInfo::Qml2ImportsPath value for
QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf
configure location entry "Qml2Imports".

At the same time, it makes the qmake .prf files dealing with QML plugins
be the QML 2 version. Those files are new in Qt 5, so we have the option
to choose which version we want to use.

Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html
Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoDoc: Adding online styles
Jerome Pasion [Mon, 19 Nov 2012 12:45:44 +0000 (13:45 +0100)]
Doc: Adding online styles

-Has the Qt logo
-For generating the archives and online snapshot

Change-Id: I88d1d6335c0ba600a62868a25fadaed8a751f2b4
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMinGW: Don't add version number '0' to the library name
Kai Koehne [Mon, 19 Nov 2012 09:19:57 +0000 (10:19 +0100)]
MinGW: Don't add version number '0' to the library name

This fixes linking on MinGW after the library renaming, and is also
in line with the logic in the nmake generator.

Change-Id: Ie25ce6c1d2b8f292c4e454db1cad9bcbbee7a05d
Suggested-by: Erik van Pienbroek
Task-number: QTBUG-27137
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoCompile with -no-widgets.
Morten Johan Sorvig [Wed, 17 Oct 2012 12:23:32 +0000 (14:23 +0200)]
Compile with -no-widgets.

Remove QApplication usage in qcocoasystemtrayicon.mm

Move qt_mac_cg_context from qpaintengine_mac.mm to
qcocoahelpers.mm to make it available in no-widgets
builds.

(Move qt_mac_colorSpaceForDeviceType as well; color
space support needs to be cleaned up later on.)

Change-Id: I724fdb09538d65eae56c26165f3ba53b6814ea78
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoRemove obsolete Mac mkspecs.
Morten Johan Sorvig [Fri, 12 Oct 2012 12:13:21 +0000 (14:13 +0200)]
Remove obsolete Mac mkspecs.

Project Builder was replaced with Xcode in Mac OS 10.3.
The xlc compiler is not in use on OS X any more.

Change-Id: Ie9150243cf5594a70f692a6841ee8221a2fa9ddb
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoFix error reporting in TDS SQL driver.
Aaron McCarthy [Thu, 8 Nov 2012 05:13:10 +0000 (15:13 +1000)]
Fix error reporting in TDS SQL driver.

The error and message handlers used by the freetds library were getting
reset to back to the default every time a database was opened.  The
Qt TDS SQL driver was calling dbinit() from QTDSDriver::open().  This
had two problems:

1. dbinit() would reset the error handler previously set by a call to
   dberrhandle().  A db error would then cause the application to
   abort.
2. freetds expects dbinit() and dbexit() to be called symmetrically.
   Opening multiple database connections would result in freetds not
   cleaning up on application close.

Solved by moving the dbinit() call into the QTDSDriver constructor.

Change-Id: I59018d83238672c903b96a4d7f3f21b664c3ff4c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>