profile/ivi/qtbase.git
11 years agoMac: disable transient scrollbar animations for non-QScrollBars
J-P Nurmi [Tue, 11 Dec 2012 14:44:14 +0000 (15:44 +0100)]
Mac: disable transient scrollbar animations for non-QScrollBars

Task-number: QTBUG-28389
Task-number: QTBUG-28380
Change-Id: I91edd9c8aba60118d722bbf9ad5b85f994398823
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoQApplication docs: restore console mode -snippet
J-P Nurmi [Mon, 10 Dec 2012 13:09:55 +0000 (14:09 +0100)]
QApplication docs: restore console mode -snippet

Change-Id: I1f8ce949ae660a209a2092a2863d5c25e2908004
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQScrollBar::initStyleOption(): fix QStyle::State_On handling
J-P Nurmi [Mon, 10 Dec 2012 13:31:50 +0000 (14:31 +0100)]
QScrollBar::initStyleOption(): fix QStyle::State_On handling

QWindowsStyle considers QStyle::State_On as pressed, whereas
QMacStyle uses the same state for transient scrollbars. Thus,
to indicate transient scrollbars, QScrollBar::initStyleOption()
must set QStyle::State_On only when the current style actually
supports transient scrollbars.

Task-number: QTBUG-28523
Change-Id: I94d207b1e8c5c4bd6f4b99e8b4f1661197fbe9dd
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoFix compilation with (all versions of) MinGW
Kai Koehne [Tue, 11 Dec 2012 09:46:56 +0000 (10:46 +0100)]
Fix compilation with (all versions of) MinGW

Commit 320b16110f0f9cef032a64846dc792d40ccd367b changed the arguments
of swprintf to be compliant with latest MinGW-w64 headers: The headers now
excludes the non-standard swprintf(wchar*t,wchar_t*,...) version for C++11.

However, the swprintf(wchar_t*,size_t,wchar_t*,...) version is actually
not supported by e.g. stock Mingw-32 from mingw.org.

Instead, use _snwprintf(wchar_t*,size_t,wchar_t*,...), which both
MSVC, and all MinGW versions should support.

Task-number: QTBUG-28520
Change-Id: Icadd11773a25143e46a72c898adfd1c324f9c468
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDoc CSS: Edited CSS line-height of paragraphs and landing page.
Jerome Pasion [Tue, 11 Dec 2012 15:13:28 +0000 (16:13 +0100)]
Doc CSS: Edited CSS line-height of paragraphs and landing page.

-value copied from qt-project.org
-more room between lines of text and the list at the landing page.

Change-Id: Iee995325ded0c803feca44d112c5e73a024917bb
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAutomatically import plugins in all applications with static Qt
Miikka Heikkinen [Tue, 11 Dec 2012 14:02:45 +0000 (16:02 +0200)]
Automatically import plugins in all applications with static Qt

Since all gui applications already need some QPA plugin added,
we might as well add the default plugin and generate the code
to import the plugins automatically.

User can opt out from the automation by removing relevant
items from CONFIG variable: link_qpa_plugin or import_plugins.

Task-number: QTBUG-28131
Change-Id: Ic171c363464c099143374d3e39bcc28f6edf73d2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoHardcoded url for RFC 1929 QTBUG-28500
Nico Vertriest [Tue, 11 Dec 2012 08:04:01 +0000 (09:04 +0100)]
Hardcoded url for RFC 1929 QTBUG-28500

Entered hardcoded url for RFC 1928 QTBUG-28500

Corrected in qtnetworkproxy.cpp

Change-Id: Idad0e2294e610095990a65ffc7d5c9c881b09329
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQGraphicsView - fix rubberband to expand on wheel event
Thorbjørn Lund Martsum [Sun, 2 Dec 2012 16:04:47 +0000 (17:04 +0100)]
QGraphicsView - fix rubberband to expand on wheel event

In SHA 51914375b615ddcac711171ac31779fea01b4323 the rubberband
selection was fixed, so it followed the scene-point on mousemove.

However wheelEvent could move the view - but avoid update of the
rubberband (that would not be updated until next mouse-move).

This patch fixes that (and generally improves rubberband behavior)
since QGraphicsViewPrivate::mouseMoveEventHandler is called by
replayLastMouseEvent, which is called from various places,
where we need to update the rubberband (e.g scrollContentsBy).

Change-Id: I1b78c27edaaecea797a2319086d7a11d437d2bd3
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoRemove incorrect and confusing documentation from qplatformwindow.cpp
Samuel Rødal [Tue, 11 Dec 2012 10:53:46 +0000 (11:53 +0100)]
Remove incorrect and confusing documentation from qplatformwindow.cpp

Change-Id: If3fd383bf7ff08a04df2e11c727c11aeef05a6de
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoConsistently prefix all platform plugin libraries with "q".
Samuel Rødal [Tue, 11 Dec 2012 08:32:24 +0000 (09:32 +0100)]
Consistently prefix all platform plugin libraries with "q".

This means the xcb plugin library will be named libqxcb.so instead of
libxcb.so, which doesn't clash with the system's libxcb.so. We need to
consistently apply this on all platforms for static linking to work.

Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQGraphicsView - move rubberband-handling into a private function
Thorbjørn Lund Martsum [Mon, 3 Dec 2012 20:37:16 +0000 (21:37 +0100)]
QGraphicsView - move rubberband-handling into a private function

This patch moves the rubberband-handling from QGraphicsView::mouseMoveEvent
to QGraphicsViewPrivate::updateRubberBand. This function is then
called from QGraphicsView::mouseMoveEvent.

I have removed some d-> and added some q-> but beside that
nothing is changed in the code.

Change-Id: Iab70c55635c43733e0e02bb70e2bb03b90bf62f0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoFixed leading tab
Robert Loehning [Mon, 10 Dec 2012 12:08:40 +0000 (13:08 +0100)]
Fixed leading tab

Change-Id: I357bf802cde3d842a7af0c13845cfda55b9c7b59
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agoconfigure : remove .qmake.vars after status message.
Elvis Lee [Thu, 29 Nov 2012 08:38:05 +0000 (17:38 +0900)]
configure : remove .qmake.vars after status message.

Change-Id: I3a4c1c10ce0d27d05faf64049224e0022a414fa4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRemove QT_DLL and QT_NODLL defines.
Stephen Kelly [Fri, 7 Dec 2012 11:39:12 +0000 (12:39 +0100)]
Remove QT_DLL and QT_NODLL defines.

Task-number: QTBUG-28044

Change-Id: Ib8c4e1e8e52703aa6590875c34f05b6bc71db808
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoQGraphicsView - add const to a not modified local variable
Thorbjørn Lund Martsum [Tue, 11 Dec 2012 06:29:44 +0000 (07:29 +0100)]
QGraphicsView - add const to a not modified local variable

The QPointF ep is not modified. There is no reason it shouldn't
be const.

Change-Id: I41fb8f9ae5296a7a40f7eb8be13fc14d56915e3f
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoQGraphicsView - remove reference to avoid weird code.
Thorbjørn Lund Martsum [Tue, 11 Dec 2012 05:42:28 +0000 (06:42 +0100)]
QGraphicsView - remove reference to avoid weird code.

Even though the code before theoretic is ok, we really shouldn't
have a reference since mapFromScene returns a QPointF and not a
const QPointF&.

Change-Id: I5ea8fd238bdbdd21fb1e3b6b5f280d45e3bc43ef
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoinstall a sane top-level examples.pro file
Oswald Buddenhagen [Mon, 10 Dec 2012 18:29:33 +0000 (19:29 +0100)]
install a sane top-level examples.pro file

generally, don't install anything from the top-level examples dirs
automatically. the global README and the aggregator examples.pro are
installed explicitly.

Change-Id: I5f6b8760f37d917b800fa85979896a471778cac0
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove bizarre jsc source reference
Oswald Buddenhagen [Fri, 7 Dec 2012 19:17:59 +0000 (20:17 +0100)]
remove bizarre jsc source reference

it compiles just fine without it.
if this was meant to inject a newer version of JSC than what is in
QtScript, it can be redone without creating a bizarre hybrid.

Change-Id: I61fe60bfa6a9bdb6423e8a7135250e332a5835ec
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agore-enable "check" targets for all projects, but with opt-out possibility
Oswald Buddenhagen [Mon, 10 Dec 2012 10:13:05 +0000 (11:13 +0100)]
re-enable "check" targets for all projects, but with opt-out possibility

the feature was backported to qt 4.8, and people apparently started to
rely on it. it doesn't add too much overhead when not used, so enable it
by default again.

Change-Id: I15890027603ede733347f2c05b36ad1389c649cf
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agofix static lib dep addition
Oswald Buddenhagen [Sat, 8 Dec 2012 10:47:31 +0000 (11:47 +0100)]
fix static lib dep addition

leave MODULE_LIBS unmodified - MODULE_LIBS_ADD takes the role of the
filtered variable.

Change-Id: I2a67078bbc453eccc08317a1ca8e3228cbc3a8f7
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoInserted hardcoded urls for State Charts and S. C. XML
Nico Vertriest [Tue, 11 Dec 2012 09:42:11 +0000 (10:42 +0100)]
Inserted hardcoded urls for State Charts and S. C. XML

Corrected in qstatemachine
QTBUG-28500

Change-Id: I45b2ffea983ee5754b080b8a6faa18d4d163e578
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agocentralize headersclean test
Oswald Buddenhagen [Thu, 6 Dec 2012 16:16:56 +0000 (17:16 +0100)]
centralize headersclean test

so other modules can actually re-use the code without referencing qtbase
sources.

Change-Id: Id66f07b476e539273dd32455e7642a17d7e5d0ef
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agodon't use testlib for headersclean test
Oswald Buddenhagen [Thu, 6 Dec 2012 15:36:57 +0000 (16:36 +0100)]
don't use testlib for headersclean test

this is a compile-only test, and it's not even marked as a testcase in
the autotest system.

Change-Id: I9b48ddad3c8e3e953d0e6fcfa010bab73289bc6f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoQMetaType: remember whether a type was registered with Q_DECLARE_METATYPE
Marc Mutz [Wed, 25 Jul 2012 07:08:33 +0000 (09:08 +0200)]
QMetaType: remember whether a type was registered with Q_DECLARE_METATYPE

There are two ways to register a type: using Q_DECLARE_METATYPE(T) and
using qRegisterMetaType<T>("T"). Doing one thing in one translation
unit and another thing in another TU constitutes an ODR violation,
because the value of QMetaTypeId<T>::Defined will differ in the two
TUs.

By adding the information whether a type was declared with
Q_DECLARE_METATYPE to the typeFlags(), such a use will trigger
the existing binary-incompatibility failure that checks for
equality of the incoming type flags with the stored ones (if any).

I had to encode the type as a defaulted function argument in order
to avoid the linker merging instantiations of the function templates
and therefore rendering the detection moot.

Change-Id: I82017caf300458b411cc8ac2f6653536fac64117
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQDoc: Fix generated anchors for c++ class signals
Topi Reinio [Fri, 7 Dec 2012 10:43:50 +0000 (11:43 +0100)]
QDoc: Fix generated anchors for c++ class signals

Add a missing 's' for plural form for signals. This fixes the linking
to Signals topic in class references.

Task-number: QTBUG-28450
Change-Id: Ic666e608b4b5b40b1f886ea581e54227e1a94678
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdded url for SVG Color Keyword Names QTBUG-28500
Nico Vertriest [Mon, 10 Dec 2012 14:29:07 +0000 (15:29 +0100)]
Added url for SVG Color Keyword Names QTBUG-28500

Change-Id: I7aaf2cbd9b4bf4e6ff35fa39c5340e3dbc4225ff
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdded hardcoded url QTBUG-28500
Nico Vertriest [Mon, 10 Dec 2012 14:30:37 +0000 (15:30 +0100)]
Added hardcoded url QTBUG-28500

Change-Id: Ida2bcd8e470cc336db69dcec6130ad942e14d3a0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoHardcoded url for Mac Os X Aqua QTBUG-28500
Nico Vertriest [Mon, 10 Dec 2012 13:36:02 +0000 (14:36 +0100)]
Hardcoded url for Mac Os X Aqua QTBUG-28500

Change-Id: I83d87d155b7ca502098a53e955fdde3c908e3300
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoHardcoded url Item View Classes QTBUG-28500
Nico Vertriest [Mon, 10 Dec 2012 12:54:57 +0000 (13:54 +0100)]
Hardcoded url Item View Classes QTBUG-28500

Removed link to Item View Classes in Qt4

Change-Id: Ic3c38a33edc88faf072b8fe7e3accfe1ee75ac78
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoWorkaround with hardcoded url QT-BUG 28500
Nico Vertriest [Mon, 10 Dec 2012 12:25:00 +0000 (13:25 +0100)]
Workaround with hardcoded url QT-BUG 28500

Change-Id: I385c14401ced85b12ce65446b224de6910bf3b37
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQdoc: workaround, put hardcoded url QTBUG 28500
Nico Vertriest [Mon, 10 Dec 2012 11:34:44 +0000 (12:34 +0100)]
Qdoc: workaround, put hardcoded url QTBUG 28500

Change-Id: Iab38307459eff8c20a66f8f41240075aaff1b086
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQdoc: put hardcoded url as workaround QTBUG-28500
Nico Vertriest [Mon, 10 Dec 2012 11:13:01 +0000 (12:13 +0100)]
Qdoc: put hardcoded url as workaround QTBUG-28500

Change-Id: Ic9d0805897278d6caaf4cd763352d2d2d98d65f6
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoEntered hardcoded urls QTBUG-28500
Nico Vertriest [Tue, 11 Dec 2012 09:17:06 +0000 (10:17 +0100)]
Entered hardcoded urls QTBUG-28500

Hardcoded urls for rfc 2109 and 2965
Corrected in qnetworkcookie.cpp

Change-Id: Id3668fec24c3c658437f22a977ea9e631a423aed
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoHardcoded url to RFC3174 QTBUG-28500
Nico Vertriest [Tue, 11 Dec 2012 07:48:09 +0000 (08:48 +0100)]
Hardcoded url to RFC3174 QTBUG-28500

Corrected in torrent.qdoc

Change-Id: Idb1bf1ed869c0db80e557832a61d6eb28585c77a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agotest: Remove CONFIG += testcase from manual tests
Sergio Ahumada [Mon, 10 Dec 2012 12:39:51 +0000 (13:39 +0100)]
test: Remove CONFIG += testcase from manual tests

Manual tests are not supposed to be run by "make check"

Change-Id: I0539b94f5286e89ddad2edf487d4b0d82fc2f374
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
11 years agoDoc: Added documentation for the examples
Venugopal Shivashankar [Thu, 6 Dec 2012 18:27:20 +0000 (19:27 +0100)]
Doc: Added documentation for the examples

- Moved documentation for the Qt XML, Qt Widgets, Qt Concurrent, and
Qt Network examples from qtdoc.
- Grouped the documentation pages under relevant groups
- Fixed \snippet paths

Task-number: QTBUG-27515
Change-Id: I43c22a679e2eefbb48e3cd5893aa2afd3d905863
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoGenerate the introspection string during parsing
Kevin Ottens [Fri, 30 Nov 2012 10:51:05 +0000 (11:51 +0100)]
Generate the introspection string during parsing

Commit 0696071316b3dacb8d1ca15a269e4f4215642b9d moved away from QDom but
also lost the ability to fill the introspection field of the created
QDBusIntrospection::Interface instances. This commit now generate the
string again as we proceed with the QXmlStreamReader based parsing.

Task-number: QTBUG-26668
Change-Id: I8f406e1f4e9d3e667a8557db69da36cac369ba4f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoDoc: Restored CSS images for the offline HTML and QCH build
Jerome Pasion [Thu, 6 Dec 2012 15:17:43 +0000 (16:17 +0100)]
Doc: Restored CSS images for the offline HTML and QCH build

Revert "Doc: Removing entry in CSS for adding icons to HTTP links"
This reverts commit ceb2799163c7e80148ef0bffafac9b05269514d7.

Also:
-edited image to use Qt Project brand colors
-removed breadcrumbs from CSS

Change-Id: I3c2e655f8eac463677b20b68bc2ffa0efd2fd468
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
11 years agoSQL: Change in QSqlResultPrivate::positionalToNamedBinding()
Caroline Chao [Fri, 16 Nov 2012 14:41:16 +0000 (15:41 +0100)]
SQL: Change in QSqlResultPrivate::positionalToNamedBinding()

With the change cff46983a, prepared queries can now store a
named paramater to be used more than once.

When using ?, thus positional binding, there is no named
parameter, thus there is no need to store it.

When prepare is called from a query with ?, it currently
causes an error when the feature QSqlDriver::NamedPlaceholders
is true. Because holders values are called while holders is
actually empty.

QSqlDriver::NamedPlaceholders is true for QOCI plugin only
but the problem is independant of the plugin used.

Adding a test case with a test driver to make the test runnable
without Oracle installed.

Change-Id: I6d7491f7e09a7b62d2d4d216b40fedd67e927e27
Reviewed-by: Matt Newell <newellm@blur.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoMark \brief comments in thread examples.
hjk [Mon, 10 Dec 2012 12:23:10 +0000 (13:23 +0100)]
Mark \brief comments in thread examples.

Change-Id: Ib496b1e500820774354c20003edb22748324cb5f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQLocale: Report RTL text direction for pa_Arab and uz_Arab
Konstantin Ritt [Mon, 10 Dec 2012 10:34:29 +0000 (12:34 +0200)]
QLocale: Report RTL text direction for pa_Arab and uz_Arab

Change-Id: I97c785c9cbf550ef1ab330a4905ff7ae97ee6a30
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix binary incompatibility between openssl versions
Shane Kearns [Thu, 6 Dec 2012 17:03:18 +0000 (17:03 +0000)]
Fix binary incompatibility between openssl versions

OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0
So we have to consider this struct as private implementation, and use
the access functions instead.

This bug would cause certificate verification problems if a different
version of openssl is loaded at runtime to the headers Qt was compiled
against.

Task-number: QTBUG-28343
Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258
Reviewed-by: Richard J. Moore <rich@kde.org>
11 years agoMove a Q_DECLARE_METATYPE higher up in the file.
Stephen Kelly [Mon, 10 Dec 2012 14:42:18 +0000 (15:42 +0100)]
Move a Q_DECLARE_METATYPE higher up in the file.

Having it low in the file causes ODR violations.

Change-Id: I6267c7c1b043e77b251a88cb8940a9f063160891
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdd QT_DEFAULT_QPA_PLUGIN to generated qconfig.pri
Miikka Heikkinen [Mon, 10 Dec 2012 14:11:47 +0000 (16:11 +0200)]
Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.pri

Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable
to specify the default QPA plugin.

"CONFIG += qpa_default_plugin" statement in application .pro file
will add the default QPA plugin into QTPLUGINS.

"CONFIG += qpa_minimal_plugin" statement in application .pro file
will add the minimal QPA plugin into QTPLUGINS.

Task-number: QTBUG-28131
Change-Id: I12a241005f30b37467d783b50f0369b47e605e68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoPro-file level support for importing plugins for static Qt builds
Miikka Heikkinen [Mon, 10 Dec 2012 13:56:29 +0000 (15:56 +0200)]
Pro-file level support for importing plugins for static Qt builds

Platform plugin is needed always when gui is linked to an application.
This is tedious to do manually for static builds, so provide support
for generating a source file that imports static plugins for
application projects.

"CONFIG += import_plugins" statement in application .pro file will
generate required import statements for all plugins specified with
QTPLUGIN variable.

The plugin class names are found from plugin's module pri generated
automatically when plugin is built, as long as the plugin specifies
the PLUGIN_CLASS_NAME in the plugin .pro file before loading
qt_plugin.prf.

Task-number: QTBUG-28131
Change-Id: I19f8ea48a3c1e9b5c81f4399c4b5d439a6d4bea1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoAdd PLUGIN_CLASS_NAME to qtbase plugins
Miikka Heikkinen [Mon, 10 Dec 2012 09:49:09 +0000 (11:49 +0200)]
Add PLUGIN_CLASS_NAME to qtbase plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: Icd993c0fc8335f29aeec30e853a408d888069399
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFixed installation of gui examples' targets
Oliver Wolff [Mon, 10 Dec 2012 13:50:53 +0000 (14:50 +0100)]
Fixed installation of gui examples' targets

Change-Id: Ie945ffac56ed83d2dc4605a073bcab4ef6f290ac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoBlackberry: Fix crash when opening file dialog without parent.
Sergio Martins [Fri, 7 Dec 2012 10:49:19 +0000 (10:49 +0000)]
Blackberry: Fix crash when opening file dialog without parent.

If parent is null, we now use qqnxintegration->primaryScreen()

This simplifies ctors of QQnxTheme and QQnxFileDialogHelper which now
receive a QQnxIntegration pointer instead of receiving a font database
and a bps event filter.

Change-Id: I3b1ed4d99f738b980a4f19a98618341a14e0c222
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoQtBase: Doc: Fix Links to designer manual.
David Schulz [Fri, 7 Dec 2012 11:33:47 +0000 (12:33 +0100)]
QtBase: Doc: Fix Links to designer manual.

Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agoQtBase: Remove linguist example which was already moved
David Schulz [Fri, 7 Dec 2012 10:22:18 +0000 (11:22 +0100)]
QtBase: Remove linguist example which was already moved

... to QtTools.

Change-Id: I707d8debcf35b01046b78718fd4b48c03b1fa6e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
11 years agosupport include paths for the Windows resource compiler
Joerg Bornemann [Thu, 6 Dec 2012 15:29:30 +0000 (16:29 +0100)]
support include paths for the Windows resource compiler

In RC_INCLUDEPATH one can add include paths for the Windows resource
compiler.

Task-number: QTBUG-13776

Change-Id: If1d9ed44097adb7789df03e4ccd4e3b7df9e8d08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoqmake: fix extra compilers in vcxprojs for single config mode
Joerg Bornemann [Thu, 6 Dec 2012 14:02:59 +0000 (15:02 +0100)]
qmake: fix extra compilers in vcxprojs for single config mode

In single config mode extra compilers were not written to Visual
Studio project files, because they were not added to the fake project
object we're using to write a single config project.

Task-number: QTBUG-27505

Change-Id: Ie57b648861573496252f1383dc77e0729e244947
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDoc: Updated outdated docs to use new macro
Christian Stenger [Thu, 6 Dec 2012 15:40:55 +0000 (16:40 +0100)]
Doc: Updated outdated docs to use new macro

Change-Id: I9a3528112fba1db988592d9f4f470ec678e81e1a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoOnly handle QTPLUGIN when linking against static Qt
Miikka Heikkinen [Fri, 7 Dec 2012 07:54:43 +0000 (09:54 +0200)]
Only handle QTPLUGIN when linking against static Qt

Usage of QTPLUGIN implies static Qt, so only handle it when that is
true so user projects do not need to scope it if they support linking
against both static and shared Qt.

Change-Id: I011b4672bac122d7d64d8f2fc0e41ca7e5251dfc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix module pri file name for static plugins
Miikka Heikkinen [Fri, 7 Dec 2012 09:46:43 +0000 (11:46 +0200)]
Fix module pri file name for static plugins

Since QTPLUGIN variable values are used to locate both the plugin
library and the module pri file, those must match. Therefore generate
module pri file name using the TARGET of the plugin rather than the
pro file name.

Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agomove cmake template files under features/data/
Oswald Buddenhagen [Thu, 6 Dec 2012 15:29:21 +0000 (16:29 +0100)]
move cmake template files under features/data/

there will be more template data, and it wouldn't be too nice
to spread it all over mkspecs/.

Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agosimplify code by using new $$absolute_path() function
Oswald Buddenhagen [Thu, 6 Dec 2012 14:35:19 +0000 (15:35 +0100)]
simplify code by using new $$absolute_path() function

Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agofinish the job of removing uic3 support
Oswald Buddenhagen [Thu, 6 Dec 2012 14:38:46 +0000 (15:38 +0100)]
finish the job of removing uic3 support

this should have been in 048b697c07.

Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoremove another dead assignment
Oswald Buddenhagen [Thu, 6 Dec 2012 13:15:14 +0000 (14:15 +0100)]
remove another dead assignment

Change-Id: I79ffdba571b48def4494b018b2a2abdee8aab0a8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoImplement Cocoa KeyMapper.
Morten Johan Sorvig [Mon, 22 Oct 2012 08:41:28 +0000 (10:41 +0200)]
Implement Cocoa KeyMapper.

Port Qt 4 implementation. Shortcuts such as shift-5
should now work.

Change-Id: I1d8c4c6c4a903142361996b558ee31c8549fcef6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoOnly generate -fPIE on unix.
Stephen Kelly [Fri, 7 Dec 2012 09:15:36 +0000 (10:15 +0100)]
Only generate -fPIE on unix.

This follows the same logic used to set bsymbolic_functions.

Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoTopologically sort $${MODULE}.depends when generating cmake files.
Stephen Kelly [Fri, 7 Dec 2012 09:13:24 +0000 (10:13 +0100)]
Topologically sort $${MODULE}.depends when generating cmake files.

The contents of this eventually go into a CMake target
property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect
sorted input. Usually the contents is generated by CMake itself,
so generating content it expects is reasonable.

This fixes the qtactiveqt cmake unit test with MingW on linux.

Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoDoc: removed control code+minor rephrasing
Nico Vertriest [Fri, 7 Dec 2012 11:04:29 +0000 (12:04 +0100)]
Doc: removed control code+minor rephrasing

QTBUG-28382

Change-Id: Ic166fcb283d3339853c68a71be9aebd6cfed0523
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoSet CGImage format when converting from QImage.
Morten Johan Sorvig [Tue, 4 Dec 2012 16:02:59 +0000 (17:02 +0100)]
Set CGImage format when converting from QImage.

Set the CGImage format based on QImage::format().
Handle8-bit per component (A)RGB.

Change-Id: I041b0ee53d3943a0aaf9e813eb0a235c4de619dd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoUse the "copy" blend mode for backingstore drawing
Morten Johan Sorvig [Tue, 4 Dec 2012 14:26:02 +0000 (15:26 +0100)]
Use the "copy" blend mode for backingstore drawing

The default is a "source over", but we want to
completely replace the destination pixels. (Which
is slightly faster).

Change-Id: I4916765258a2236f70f58a8e20b06f80739183c1
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoAvoid backing store color space conversions.
Morten Johan Sorvig [Tue, 4 Dec 2012 14:19:27 +0000 (15:19 +0100)]
Avoid backing store color space conversions.

We want the Qt backing store to be in the device color
space by default. This will avoid colour space conversions
when blitting it to screen, at the cost of a potential
loss in color accuracy.

As it turns out, CGColorSpaceCreateDeviceRGB no longer
crates a device color space but rather a generic color
space. (Since 10.4). Create the color space with a system
profile instead.

Accurate color representation needs to be supported
at some point, but this fast path should be the
default.

Change-Id: I7ebb77b36f81f66119d8c2ef464723401ec1d1e8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
11 years agoDeleted wrong statement about nr Qt JSON classes
Nico Vertriest [Wed, 5 Dec 2012 13:55:31 +0000 (14:55 +0100)]
Deleted wrong statement about nr Qt JSON classes

Change-Id: I58d8ab73d3018d9712ec9485e0b8e52a5a75da5e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoUpdate QNSView geometry on window resize.
Morten Johan Sorvig [Thu, 6 Dec 2012 16:46:07 +0000 (17:46 +0100)]
Update QNSView geometry on window resize.

Ideally this should not be required since NSWindow
should resize the content view automatically. However,
in the case of modal QDialogs this does not happen.

Add call to updateGeometry in windowDidResize as a
workaround, and remove code which called QNSView::setFrameSize
with the current size.

This will cause duplicate handleGeometryChange calls
in the non-qdialog case, add a test to see if the geometry
really has changed to prevent that.

Change-Id: I29bea23b2ab72f923aeadf8db8cb9131ae177a28
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoCompile with QT_NO_CURSOR.
Volker Krause [Wed, 5 Dec 2012 10:42:58 +0000 (11:42 +0100)]
Compile with QT_NO_CURSOR.

Mostly straightforward, the a11y changes might look a bit drastic, but the
base class QAccessibleTextWidget was already disabled in this case, so we
have to obviously take out its sub-classes as well.

Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
11 years agoMake the documentation more explicit an talkative
Laszlo Papp [Thu, 6 Dec 2012 23:02:00 +0000 (23:02 +0000)]
Make the documentation more explicit an talkative

Change-Id: Ifa4b7c3c5f8ec384addbb80a9436d55b32d8bc51
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFix typos and style in QToolBar documentation
David Gil [Thu, 6 Dec 2012 22:28:40 +0000 (23:28 +0100)]
Fix typos and style in QToolBar documentation

Change-Id: Ic4b4e18746382bae1b6dae009e1e5663c7a21a84
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agodoc: Remove documentation for removed TRUE and FALSE macros
Sergio Ahumada [Thu, 6 Dec 2012 19:48:00 +0000 (20:48 +0100)]
doc: Remove documentation for removed TRUE and FALSE macros

These macros were removed by 158f39ec7870c54ff3a15f72fe151062d6daa172

Change-Id: I2aabef1dd2c9cb3949040c167a4e5cf1a9390ba6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRemoved requestOrientation() API from QWindow.
Samuel Rødal [Wed, 5 Dec 2012 16:38:58 +0000 (17:38 +0100)]
Removed requestOrientation() API from QWindow.

There are no proper implementations of this API, and as it stands it
only acts to confuse anyone who stumbles across it. It will be better to
revisit the full cross platform orientation API story for 5.1.

Change-Id: Iff7054a32c6e5e4ad0cc0493a5e4ecc35a6ec4f3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoconfigure.exe: fix -inotify option
Rafael Roquetto [Wed, 5 Dec 2012 23:45:48 +0000 (21:45 -0200)]
configure.exe: fix -inotify option

Change-Id: Iaa844961b5fdd2056fcc9b008c11a3f3925ca3a4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix compile with -DQT_NO_SYSTEMTRAYICON
Montel Laurent [Thu, 6 Dec 2012 13:54:01 +0000 (14:54 +0100)]
Fix compile with -DQT_NO_SYSTEMTRAYICON

Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoWarn when XDG_RUNTIME_DIR isn't set, as per XDG Base Dir Spec
David Faure [Wed, 5 Dec 2012 23:02:31 +0000 (00:02 +0100)]
Warn when XDG_RUNTIME_DIR isn't set, as per XDG Base Dir Spec

http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
says: "If $XDG_RUNTIME_DIR is not set applications should fall back to a
replacement directory with similar capabilities and print a warning message."

Better warn that not all the guarantees of XDG_RUNTIME_DIR are available,
and push unixes who haven't done so yet, to set things up correctly.

Change-Id: Ie3998e8c1d14e4fdf8d58dfb2932f0ad708fba50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoqmake: add ProductVersion to automatically generated resource
Joerg Bornemann [Thu, 6 Dec 2012 13:29:53 +0000 (14:29 +0100)]
qmake: add ProductVersion to automatically generated resource

ProductVersion is set to the same value as FileVersion.

Task-number: QTBUG-27428

Change-Id: Ia01e14112d3a0e74b9fbe5fc8d9c4f9ae690db34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoQProcess: Fix compilation with MinGW
Kai Koehne [Thu, 6 Dec 2012 13:59:15 +0000 (14:59 +0100)]
QProcess: Fix compilation with MinGW

newer mingw-w64 headers do not support swprintf(wchar_t*,wchar_t*, ..)
any more.

Change-Id: I2fc1fb51ba8d5237149697f77a91abd6469ebb09
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoDon't pass invalid strings to strcmp()
Peter Kümmel [Sat, 1 Dec 2012 11:21:20 +0000 (12:21 +0100)]
Don't pass invalid strings to strcmp()

The address behind a string doesn't point to a string.

Change-Id: Ic54f652ae781fea278f60cc49d219c1c610ba29f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoMac: Missing update when hovering from one scrollbar to another
Gabriel de Dietrich [Wed, 5 Dec 2012 19:23:57 +0000 (20:23 +0100)]
Mac: Missing update when hovering from one scrollbar to another

Change-Id: I9837bb72935cb4e3680e4bd23b5535f654b5fde6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoMac: Transient scrollbars should overlap in the corner on 10.8
Gabriel de Dietrich [Wed, 5 Dec 2012 15:20:12 +0000 (16:20 +0100)]
Mac: Transient scrollbars should overlap in the corner on 10.8

Change-Id: Ied239d5e3cb05bed6b892607f0344e6daa028918
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agodoc: Add changes to dnd docs from qtdoc repository
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 14:18:15 +0000 (15:18 +0100)]
doc: Add changes to dnd docs from qtdoc repository

Change da54c5e7c9bf7647664a3529a6db487dee94d331 in the qdoc
repository was made to the wrong version of this documentation.
This change just adds them in qtbase and fixes some of the snippets
which were still broken.

Change-Id: Ie9ba57b5a2d20a629aa5f0a492daa207d35b2053
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoMac: Animated expanding scrollbars on 10.8
Gabriel de Dietrich [Mon, 3 Dec 2012 18:00:03 +0000 (19:00 +0100)]
Mac: Animated expanding scrollbars on 10.8

Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoMac: Cleaner transient scrollbar rendering
Gabriel de Dietrich [Mon, 3 Dec 2012 14:55:15 +0000 (15:55 +0100)]
Mac: Cleaner transient scrollbar rendering

Change-Id: I617588012aa5166775c3c6301ee70043b22553a3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoDocs: Fix some warnings
Christian Stenger [Thu, 6 Dec 2012 14:36:17 +0000 (15:36 +0100)]
Docs: Fix some warnings

Change-Id: I3898c89e54aa671ff8cb1b25c49cfe3835ab9384
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Remove obsolete statement
Christian Stenger [Thu, 6 Dec 2012 12:37:02 +0000 (13:37 +0100)]
Doc: Remove obsolete statement

Change-Id: Ic7f14dae391684a4870e030ab4549b3a59f1ea5f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Fix some enums
Christian Stenger [Thu, 6 Dec 2012 12:32:25 +0000 (13:32 +0100)]
Doc: Fix some enums

Change-Id: I58f2906e9605e8ab09cad29880006ed60cc23e80
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDocs: fix QStyle related warnings
J-P Nurmi [Thu, 29 Nov 2012 14:12:35 +0000 (15:12 +0100)]
Docs: fix QStyle related warnings

Change-Id: I4e67e34ecc0fc8050938a681b2c393b8442fce2e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoQtWidgets docs: use WinVista screenshots instead of obsolescent WinXP
J-P Nurmi [Thu, 29 Nov 2012 15:44:01 +0000 (16:44 +0100)]
QtWidgets docs: use WinVista screenshots instead of obsolescent WinXP

Change-Id: Ic7fd291d4ce4468ae12cf5dd102fbcc45387dd87
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdjust qttestlib.qdocconf to create qttestlib/examples-manifest.xml
hjk [Thu, 6 Dec 2012 13:04:38 +0000 (14:04 +0100)]
Adjust qttestlib.qdocconf to create qttestlib/examples-manifest.xml

Change-Id: I6c4c8d9b69f135229bd0bd28e8e57738742f6bd8
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodoc: Avoid duplicate widget example entries
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 13:16:04 +0000 (14:16 +0100)]
doc: Avoid duplicate widget example entries

The link to widget examples in QtCore was added
in 4519d810d1d2be3af17bdd77edac2361620f9d2d, which made
widget examples pop up twice in generated lists
(once for qtcore and once for qtwidgets documentation).

I'm not sure why it was originally added to that module, but
the snippets in the fridgemagnets example (which was the
example fixed in the commit) has been verified to still work.

Change-Id: I1b349f08349b5499929315d426224ba8638adc8e
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agodoc: Add missing images in richtext example docs
Eskil Abrahamsen Blomfeldt [Thu, 6 Dec 2012 13:07:41 +0000 (14:07 +0100)]
doc: Add missing images in richtext example docs

Copied from Qt 4.8

Change-Id: Ic98a5e87305dbf9bb0df7ae071c42bb42a803b10
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoRemove references to pre-build examples from dist/README
hjk [Thu, 6 Dec 2012 13:11:27 +0000 (14:11 +0100)]
Remove references to pre-build examples from dist/README

We do not want to ship them anymore.

Change-Id: I62ac985cdf3f6d13327d1fd88262cc60efc4a230
Reviewed-by: Hanne Linaae <hanne.linaae@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoQtBase: Doc: Fix links to STL-style iterators
David Schulz [Thu, 6 Dec 2012 08:49:07 +0000 (09:49 +0100)]
QtBase: Doc: Fix links to STL-style iterators

Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoMSVC: don't use the variable name LINK in generated makefiles
Joerg Bornemann [Tue, 4 Dec 2012 11:36:56 +0000 (12:36 +0100)]
MSVC: don't use the variable name LINK in generated makefiles

Rename LINK to LINKER. The MSVC linker uses the environment
variable LINK to pass additional command line arguments.
We must not hide this variable.

Task-number: QTBUG-28332

Change-Id: Id78476d1cf4a73175b9f47292c67f38a43ae5ba4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoremove dead line
Oswald Buddenhagen [Wed, 5 Dec 2012 21:01:58 +0000 (22:01 +0100)]
remove dead line

the compile-all-mocs-as-one-file feature is gone for years

Change-Id: I6c35bce59c36b6920af2498661172b5938eeba52
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agouse the same output dirs under windows as under unix
Oswald Buddenhagen [Wed, 5 Dec 2012 20:59:49 +0000 (21:59 +0100)]
use the same output dirs under windows as under unix

the times when directory names starting with a dot were a problem under
windows are sort of gone. for well over a decade.

Change-Id: Ia1a0782c878a055cc5c094c6b3e4df0741368433
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoreplace all modules' build dirs while installing .pc, .la & .prl files
Oswald Buddenhagen [Wed, 5 Dec 2012 20:52:49 +0000 (21:52 +0100)]
replace all modules' build dirs while installing .pc, .la & .prl files

now we may get files with several mentions of the same lib/include dirs
on the same line, but that's essentially a non-issue.

Task-number: QTBUG-28336
Change-Id: I8204086420b82015f62090ae0a56908ce0cccee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoexport the Qt top-level include dir as pkg-config ${includedir}
Oswald Buddenhagen [Wed, 5 Dec 2012 20:33:02 +0000 (21:33 +0100)]
export the Qt top-level include dir as pkg-config ${includedir}

this seems more generic, and allows for more substitutions inside the
generated files.

Change-Id: I7a2e37036f9f9f7dbf7f28f0976ef427dd28ee82
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoexport only 'host_bins' to pkg-config, rather than a random selection of tools
Oswald Buddenhagen [Wed, 5 Dec 2012 19:54:09 +0000 (20:54 +0100)]
export only 'host_bins' to pkg-config, rather than a random selection of tools

the "export location" of the linguist tools was just bogus, and lconvert
was missing anyway. the two dbus tools and qdoc were missing, too.
generally, it seems useless to report the paths of some random tools -
instead, just report the install location of the host binaries and let
users figure out the complete paths themselves - this should be ok, as
we decided that distributors are not supposed to do tool renaming any
more.

for the binary path just use the final location, as the files won't be
used before installation anyway. this allows us removing the scary
generic prefix replace from the pc file installs.

and as a side effect this also fixes debug_and_release builds of core
and widgets by not loading various prf files prematurely and thereby
messing up the dir replacement magic.

Task-number: QTBUG-28286
Change-Id: I99de419301fc07fb923959db4bd5cab9072d1c31
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>