qt:anselmolsm-qtbase.git
5 years agoWe shouldn't have a Makefile here.
Lars Knoll [Sun, 24 Jun 2012 22:18:36 +0000 (00:18 +0200)]
We shouldn't have a Makefile here.

Change-Id: If55952b4aa9b95ff9311c1b7338b77af62a5c503
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoRemove the font codecs
Lars Knoll [Sun, 24 Jun 2012 21:45:22 +0000 (23:45 +0200)]
Remove the font codecs

These codecs have only been used for XLFD based fonts.
These are not supported anymore by Qt 5.

Change-Id: I7dc083f2efcd42363b144b24bd62c169d83390cf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoThe codecForTr() should be utf8
Lars Knoll [Sun, 24 Jun 2012 21:31:45 +0000 (23:31 +0200)]
The codecForTr() should be utf8

tr() assumes utf8 as input encoding, not
latin1.

Change-Id: If834f8c169bdb431d78713d14b03542d3a7ca8e4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix docs mentioning Q_EXPORT_PLUGIN2
Lars Knoll [Sun, 24 Jun 2012 20:12:21 +0000 (22:12 +0200)]
Fix docs mentioning Q_EXPORT_PLUGIN2

Fix all remaining places where Q_EXPORT_PLUGIN2
was being used in the documentation.

Change-Id: I7be67b83c18545d0e74f250b4b26583444b01909
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUse the new plugin system
Lars Knoll [Sun, 24 Jun 2012 20:11:39 +0000 (22:11 +0200)]
Use the new plugin system

Convert the last remaining three plugins over from
the old plugin system.

Change-Id: I355e6bb068ec4afb58a2ee9542f86e2913b3851d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix return type of isActiveConfig("host_build")
Simon Hausmann [Sat, 23 Jun 2012 15:52:41 +0000 (17:52 +0200)]
Fix return type of isActiveConfig("host_build")

The return type of isActiveConfig is a boolean, so return that when
host_build is queried.

Change-Id: I6d1420b49b09e51442c4b2d482e2f19b165081d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoMake qtbase compile with QT_NO_DRAGANDDROP
Tasuku Suzuki [Wed, 20 Jun 2012 01:29:04 +0000 (10:29 +0900)]
Make qtbase compile with QT_NO_DRAGANDDROP

Change-Id: Ief16e435af6e6d246b84505a1c1208994c7b0b38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
5 years agoEnsure that no extra bits can leak into QUrl::toEncoded.
Thiago Macieira [Tue, 22 May 2012 13:16:01 +0000 (15:16 +0200)]
Ensure that no extra bits can leak into QUrl::toEncoded.

Technically, this function should take QUrl::UrlFormattingOptions, but
that doesn't exist. So we just mask out the high bits that determine
the encoding options. toEncoded only supports one encoding way: fully
encoded.

Change-Id: I1445ad7c292500921ec2672be4524d7d76a39f98
Reviewed-by: David Faure <faure@kde.org>
5 years agoadd possibility to set $$MODULE_IMPORT_SUFFIX in module .pri files
Oswald Buddenhagen [Tue, 19 Jun 2012 15:09:47 +0000 (17:09 +0200)]
add possibility to set $$MODULE_IMPORT_SUFFIX in module .pri files

quick1 got a suffix, so we need a way to set it

Change-Id: I099b868106abd4d3040047703472faa65f694f31
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoMake qtbase compile with QT_NO_CSSPARSER
Tasuku Suzuki [Wed, 20 Jun 2012 20:55:57 +0000 (22:55 +0200)]
Make qtbase compile with QT_NO_CSSPARSER

Change-Id: Iadcc7dfde6b06c339118c00a645d9dc592a0eead
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoWrap QObject usage in qsharedpointer_impl.h with ifndef QT_NO_QOBJECT
Thiago Macieira [Sat, 23 Jun 2012 22:41:57 +0000 (00:41 +0200)]
Wrap QObject usage in qsharedpointer_impl.h with ifndef QT_NO_QOBJECT

Otherwise, bootstrapped tools like qmake and moc won't compile, unless
QObject is forward-declared (which it isn't anymore).

Change-Id: If67ca1cd8fdb7b29628f9dc4b454595d26a715d0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoRemove documentation for QIconEnginePlugin::keys().
Robin Burchell [Sat, 23 Jun 2012 10:03:24 +0000 (12:03 +0200)]
Remove documentation for QIconEnginePlugin::keys().

Method was removed in dcf3c95175a93cf883e14a6d434b4306df50cf37.

Change-Id: I6c01ea7d329e15aec8b4ce29e8d3d5c3e784731a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoGuard evdev specifics with QT_NO_EVDEV.
Robin Burchell [Fri, 22 Jun 2012 13:12:38 +0000 (15:12 +0200)]
Guard evdev specifics with QT_NO_EVDEV.

Android fails the evdev configure test at present.

Change-Id: I1cbaf2dab589f647c02c8c5b92f72bd5159ccfa9
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
5 years agoSet Wayland as default platform on Raspberry-Pi
Donald Carr [Wed, 6 Jun 2012 22:11:21 +0000 (22:11 +0000)]
Set Wayland as default platform on Raspberry-Pi

Update Raspberry-Pi mkspec to indicate that wayland is the default platform
for the Raspberry-Pi.

Change-Id: I10b30ecfb16faed6027137225d9e95409faa7e87
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
5 years agoFix setMouseTracking on QGLWidget
Laszlo Agocs [Sat, 23 Jun 2012 09:12:10 +0000 (11:12 +0200)]
Fix setMouseTracking on QGLWidget

Remove the function altogether. Alternatively we could call the
base class implementation but there is no reason to keep this
confusing, non-virtual override.

Change-Id: Ie8724f7bbc6666fdace7ff777bcde99f3d8a9561
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
5 years agoMake test work on Mac OS X
Harald Fernengel [Fri, 22 Jun 2012 22:06:18 +0000 (00:06 +0200)]
Make test work on Mac OS X

Change-Id: I0c2d9bc7500972144d44060f38bc7a5da65ed30f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoDon't operate on bogus data, assert on preconditions instead
João Abecasis [Fri, 8 Jun 2012 13:25:26 +0000 (15:25 +0200)]
Don't operate on bogus data, assert on preconditions instead

QVector::erase shouldn't try to make sense of iterators it doesn't own,
so the validation being done here is bogus and dangerous. Instead, it's
preferrable to assert, the user needs to ensure proper ownership.

The case of erasing an empty sequence is not checked for preconditions
to allow

    QVector v;
    v.erase(v.begin(), v.end());

, while being stricter on other uses.

Autotests were using ill-formed calls to the single argument erase()
function on an empty vector and were fixed. This function erases exactly
one element, the one pointed to by abegin and require the element exist
and be valid.

Change-Id: I5f1a6d0d8da072eae0c73a3012620c4ce1065cf0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoSkip 3 test methods if the test server isn't set up.
David Faure [Sat, 23 Jun 2012 09:40:53 +0000 (11:40 +0200)]
Skip 3 test methods if the test server isn't set up.

This makes things easier for developers touching QtCore and running
all QtCore unit tests.

Change-Id: I7aa832a6a1be07d90cacad2eecb2364285ff3818
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoAdd a variable for the private includes for modules.
Stephen Kelly [Fri, 22 Jun 2012 17:18:45 +0000 (19:18 +0200)]
Add a variable for the private includes for modules.

This is required to use QPA for example in 5.0.

Change-Id: I44bfc6987d778370e55c05c591f63ff84c482d0a
Reviewed-by: David Faure <faure@kde.org>
5 years agoGive the CMake unit tests more meaningful names.
Stephen Kelly [Fri, 22 Jun 2012 08:04:05 +0000 (10:04 +0200)]
Give the CMake unit tests more meaningful names.

Change-Id: I0a54d32ec62ff6daf7672d0aabdeb038f4c7c78f
Reviewed-by: David Faure <faure@kde.org>
5 years agoForward-port change to QT4_ADD_RESOURCES macro for missing rcc files.
Stephen Kelly [Tue, 19 Jun 2012 15:09:23 +0000 (17:09 +0200)]
Forward-port change to QT4_ADD_RESOURCES macro for missing rcc files.

Forward-port of commit 9ce67d30011db4528d3d0bbee36412e13cfb80cc in
cmake.git.

Change-Id: I2d6c14f68f1630fc0835b3103e5058f52c2d0d13
Reviewed-by: David Faure <faure@kde.org>
5 years agoImplement QXcbIntegration::queryKeyboardModifiers()
David Faure [Thu, 21 Jun 2012 23:30:39 +0000 (01:30 +0200)]
Implement QXcbIntegration::queryKeyboardModifiers()

Change-Id: Ifd2255362f5ef005e2a57f4001a72d932497b453
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
5 years agoDocu: fix copy/paste typo
David Faure [Thu, 21 Jun 2012 13:41:00 +0000 (15:41 +0200)]
Docu: fix copy/paste typo

Change-Id: Ie3573ab6983c2b66c66b0f9c342f72018674016c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
5 years agoQPA docs: list the platform names that the method is likely to return.
David Faure [Thu, 21 Jun 2012 13:38:19 +0000 (15:38 +0200)]
QPA docs: list the platform names that the method is likely to return.

Change-Id: Ia98c534fbdb157ff7b2b328a832941772ea833ec
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
5 years agoAdd gui-private to generic plugins
Girish Ramakrishnan [Fri, 22 Jun 2012 12:27:43 +0000 (14:27 +0200)]
Add gui-private to generic plugins

QWindowSystemInterface will shortly be marked as QPA API.

Change-Id: I0b7cb1a75e3a4f0fc4627329edd3bfd21583a0a6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
5 years agoeglfs: move m_pos into Cursor
Girish Ramakrishnan [Wed, 20 Jun 2012 00:09:06 +0000 (17:09 -0700)]
eglfs: move m_pos into Cursor

Change-Id: I51e92d265e7ea6372ae58b357f75362e2d9a2df9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
5 years agoFix non inheritable socket creation on old windows versions
Shane Kearns [Tue, 19 Jun 2012 16:38:40 +0000 (17:38 +0100)]
Fix non inheritable socket creation on old windows versions

The documentation is misleading, as using the new API actually
causes WSASocket to fail.
New behaviour:
On windows vista or earlier: skip the new API, use old one
On windows 7: try the new API first, if it fails try the old one
On windows 8: try the new API only

The windows 7 behaviour is because we don't know if the service
pack has been installed or not. (And IT departments may have
specifically installed/blocked the hotfix)

Task-number: QTBUG-26224
Change-Id: I6da47959919caee0cd2697f1ae1fca46aa33c1ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mikhail Vorozhtsov
5 years agoEnsure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0
Andy Shaw [Fri, 22 Jun 2012 08:45:51 +0000 (10:45 +0200)]
Ensure that Proxy-Connection: Keep-Alive is respected for HTTP 1.0

When doing a NTML authentication it would close the connection after
the second phase before replying when the reply was a HTTP 1.0 version
reply. Since the Proxy-Connection header is set to Keep-Alive in this
case we want to ensure we do not close in this siutation.

Task-number: QTBUG-26037

Change-Id: Icaaf2277efc0d05a946c52fb42b5191964e2e0fe
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoFix key modifiers in mouse wheel events on Windows.
Glenn Watson [Fri, 22 Jun 2012 00:36:36 +0000 (10:36 +1000)]
Fix key modifiers in mouse wheel events on Windows.

The Windows platform plugin was not checking for the control or
shift keyboard modifiers when processing mouse wheel events. Added
a function to convert Windows wheel events to Qt::KeyboardModifiers
and passed this through the event chain.

Task-number: QTBUG-25754
Change-Id: I6551e98b4eaebad5704058bddfb06502ded5155d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoReimplement QXcbWindow::startSystemResize() with xcb
Uli Schlachter [Thu, 21 Jun 2012 19:01:48 +0000 (21:01 +0200)]
Reimplement QXcbWindow::startSystemResize() with xcb

This function just sends a ClientMessage to the window manager. XCB can
do this fine and there is no need to require Xlib for the job.

Change-Id: Iad3d78c393c1f439fff987fa19b4d82513810930
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoqtdbus: Export org.freedesktop.DBus.Peer interface when introspected
Daniele E. Domenichelli [Thu, 21 Jun 2012 18:41:27 +0000 (20:41 +0200)]
qtdbus: Export org.freedesktop.DBus.Peer interface when introspected

The ofD.Peer interface is automatically implemented when an object is
registered on DBus, but the ofD.Introspectable.Introspect method does
not show it.

You can test it by running

$ qdbus --literal <some service> <some object> \
>    org.freedesktop.DBus.Peer.Ping

$ qdbus --literal <some service> <some object> \
>    org.freedesktop.DBus.Peer.GetMachineId

Change-Id: I7062ba0cdae486d443011ee19cf3874aabf90205
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQUnicodeTables: some internal API renamings
Konstantin Ritt [Sun, 17 Jun 2012 01:55:07 +0000 (04:55 +0300)]
QUnicodeTables: some internal API renamings

enums GraphemeBreak, WordBreak, and SentenceBreak has been renamed to
GraphemeBreakClass, WordBreakClass, and SentenceBreakClass respectively,
their values has been renamed to contain a '_' as logical enum-value separator
(just like many other nums in Qt, e.g. LineBreakClass);
*BreakFormat has been replaced with *Break_Extend (some format characters are
kind of subtype of the extender characters, not vice versa).

Change-Id: I9ddbcf8848da87409736c2d6d1798a62fa28cab8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoClean-up the Unicode tables generator code and the generated header
Konstantin Ritt [Sun, 17 Jun 2012 01:20:59 +0000 (04:20 +0300)]
Clean-up the Unicode tables generator code and the generated header

This fixes the blocks and memory consumption reports, the whitespace issues
and makes the code a bit cleaner.

Since I'm the only one who does change this code, such a no-op commit
could not hurt anyone or even git blame ;)

Change-Id: Ib069f925a3791c82e16c368c8392bcffbfd68c53
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
5 years agoembedded doesn't exist anymore
Girish Ramakrishnan [Fri, 22 Jun 2012 05:10:16 +0000 (07:10 +0200)]
embedded doesn't exist anymore

Change-Id: Ib56895defb72f51bb790994b9fd72fc81ef25af5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agotst_qgraphicsview hoverLeave regressed
Toby Tomkins [Fri, 22 Jun 2012 03:16:43 +0000 (13:16 +1000)]
tst_qgraphicsview hoverLeave regressed

Task-number: QTBUG-26274

Change-Id: Ieafc6bf4a7fa5287985610a4dea57fbe6f3a9eba
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRestore building of examples, tests.
Rohan McGovern [Thu, 21 Jun 2012 01:01:27 +0000 (11:01 +1000)]
Restore building of examples, tests.

Without this, a simple "configure && make" will not build the examples
or tests, even if the "-make tests -make examples" options were used.

This is a partial revert of 709cc8800e7d8600e181cf6b9f8b1033faefe596.

Change-Id: If363cd24d30ba4c102a35ed2617999ae4e9ed9b0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
5 years agoFixes high CPU usage on timer expiration when using glib event loop.
Daniel Thor Kristjansson [Wed, 20 Jun 2012 19:17:15 +0000 (15:17 -0400)]
Fixes high CPU usage on timer expiration when using glib event loop.

GTimerSource has 1ms accuracy, QTimerInfoList::timerWait() has 1us accuracy.
So when there is less than 1 ms left on the timer we enter a tight loop
checking for timer expiration since we don't round up the timerWait()
timer to the nearest millisecond.

Task-number: QTBUG-7618
Change-Id: I684c9236324f598bc69c6810be270aa47c791f91
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUpdate the docs about setRoleNames deprecation.
Stephen Kelly [Thu, 21 Jun 2012 14:24:28 +0000 (16:24 +0200)]
Update the docs about setRoleNames deprecation.

Change-Id: I5aff626979238014d34cba1d383051cd4b048499
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
5 years agofix doc typo in qwindow.cpp
Joerg Bornemann [Thu, 21 Jun 2012 12:42:39 +0000 (14:42 +0200)]
fix doc typo in qwindow.cpp

Change-Id: I0980319e32b94882fe882c57cd8341f6b3e62048
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoFix possible crash when copying QImage.
Kim Motoyoshi Kalland [Wed, 20 Jun 2012 11:45:32 +0000 (13:45 +0200)]
Fix possible crash when copying QImage.

Task-number: QTBUG-14766

Change-Id: I82a4736dbd5ac08ede1b2bdccfa29a2009ebb4d8
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
5 years agoQDoc: Use the module page as link in qt.ditamap.
Casper van Donderen [Wed, 13 Jun 2012 17:33:32 +0000 (19:33 +0200)]
QDoc: Use the module page as link in qt.ditamap.

If the number of [QML]module pages in a single qdoc run is 1: Use it as the link for the nested group of documentation pages in the automatically generated ditamap.

Change-Id: Idbc3e2e5d65a1e7f0201638102ffab62475a66ec
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
5 years agoQDoc: Use 'Type' instead of 'element' in instantiates.
Casper van Donderen [Thu, 21 Jun 2012 07:58:03 +0000 (09:58 +0200)]
QDoc: Use 'Type' instead of 'element' in instantiates.

On a C++ documentation page "is instantiated by QML element" was printed
when you have a QML Type that instantiates this class. The text is now
changed to "is instantiated by QML Type".

Change-Id: I6c93531edc6ef9ac112573034fd54fa52390bc37
Reviewed-by: Martin Smith <martin.smith@nokia.com>
5 years agoRemove QWS references from testlib
Girish Ramakrishnan [Wed, 20 Jun 2012 01:22:44 +0000 (18:22 -0700)]
Remove QWS references from testlib

Change-Id: Iad52a5c44b27cb11a47987c9f8890cc67b557fb7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoAvoid unnecessary detach when saving to BMP.
Kim Motoyoshi Kalland [Tue, 19 Jun 2012 12:18:16 +0000 (14:18 +0200)]
Avoid unnecessary detach when saving to BMP.

Task-number: QTBUG-11486

Change-Id: Ic9aa733da4f23dc3eaba111c97a39bfd911f8cb3
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
5 years agoNew command line switches for configure.exe
Rafael Roquetto [Wed, 20 Jun 2012 14:00:34 +0000 (16:00 +0200)]
New command line switches for configure.exe

Adds support for the following command line switches to configure.exe tool:
    * -nis (-no-nis)
    * -cups (-no-cups)
    * -iconv (-sun-iconv, -gnu-iconv, -no-iconv)
    * -neon (-no-neon)
    * -largefile
    * -fontconfig (-no-fontconfig)
    * -posix-ipc
    * -glib
    * -system-freetype
    * -sysconfdir <dir>

Change-Id: I0e299f02605bdcb588ae746f397b92ec23a7ff23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoQTextLayout docs: a minor typo fix
Konstantin Ritt [Tue, 19 Jun 2012 01:27:41 +0000 (04:27 +0300)]
QTextLayout docs: a minor typo fix

Change-Id: I5e6d02f17e9064afe0c21dda806e67bc14c728b7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoproper filling when using Qt::TexturePattern
Konrad Grochowski [Tue, 19 Jun 2012 15:15:11 +0000 (17:15 +0200)]
proper filling when using Qt::TexturePattern

fix for using both Qt::OpaqueMode and
Qt::TexturePatter for filling

Task-number: QTBUG-19202
Change-Id: Ia92363cacaa51140fe78b542d9768aead81868ff
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
5 years agoFix qitemview and qdatetimeedit autotest builds for WinCE.
Janne Anttila [Tue, 19 Jun 2012 08:27:06 +0000 (11:27 +0300)]
Fix qitemview and qdatetimeedit autotest builds for WinCE.

Defined missing SPI_GETPLATFORMTYPE macro as it was done in for example
in qwidget and qaccesiblity test cases.

Change-Id: I33a1e0119848911fbc4830299fcc1854f5259e86
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
5 years agoFix qdiriterator autotest build for WEC7.
Janne Anttila [Tue, 19 Jun 2012 08:08:39 +0000 (11:08 +0300)]
Fix qdiriterator autotest build for WEC7.

Change-Id: I18b1bdd79905761eff7a5ddbe1c6538c33624a1f
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
5 years agoFixed mouse grabbing preventing popups from being closed.
Samuel Rødal [Mon, 18 Jun 2012 13:53:30 +0000 (15:53 +0200)]
Fixed mouse grabbing preventing popups from being closed.

The pointer grabbing leads to fake Enter events being sent to the
Qt::Popup window, preventing it from closing since QWidget::underMouse()
returns true. We should only send Enter events if the mouse is actually
inside the widget.

Change-Id: I4ba3fb08943580f93ad4337ff0227becd647767e
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoHandle fragmented responses on SOCKS5 control channel
Shane Kearns [Tue, 12 Jun 2012 15:46:37 +0000 (16:46 +0100)]
Handle fragmented responses on SOCKS5 control channel

Server responses may arrive in more than one packet, though this
is rare due to nagle algorithm.
Also fixed IPv6 addresses being discarded from server responses,
which was caught by the new autotest.

Task-number: QTBUG-18564

Change-Id: I32d9e2978037fb3e1fff27b7e618b5da6d222f28
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
5 years agoFix qfile autotest build for WEC7
Janne Anttila [Tue, 19 Jun 2012 08:11:13 +0000 (11:11 +0300)]
Fix qfile autotest build for WEC7

Change-Id: I6c4b4c91ea841ccb91ad685510caaecaf51baced
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoAdd new benchmark metrics to testlib
Chris Adams [Wed, 9 May 2012 06:43:53 +0000 (16:43 +1000)]
Add new benchmark metrics to testlib

QElapsedTimer provides nanosecond-resolution elapsed timing, which
allows for finer granularity benchmark reporting.  Also, clients
may also wish to benchmark the memory usage of a particular component,
but no metric currently exists which matches that requirement.

This commit adds the WalltimeNanoseconds and BytesAllocated metrics
to meet these needs.  It is intended for manual use by clients via
setBenchmarkResult() only.

Change-Id: Ib37ada374e265c857eda02d047d51d436618e4a7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
5 years agoDoc: tmake -> qmake, it's about time
Daniel Molkentin [Mon, 18 Jun 2012 23:00:16 +0000 (01:00 +0200)]
Doc: tmake -> qmake, it's about time

Pushing this before 5.0 since it will most certainly
trigger a major recompile, which is probably why
this has never been changed.

Change-Id: I5fd90537d3b754d0a8a1b522d66183513693e0af
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoChange default Content-Type for http POST to match 4.7.4
Shane Kearns [Wed, 13 Jun 2012 16:27:31 +0000 (17:27 +0100)]
Change default Content-Type for http POST to match 4.7.4

Qt 4.7.3 sent no Content-Type header by default.
This was fixed independently on 4.8.0 and 4.7.4 branches, with
different defaults.
Since this is often used for web service logins, the 4.7.4
default of x-www-form-urlencoded seems more likely to work.

The warning message is left in place, since not specifying the
content type is still an application bug.

Task-number: QTBUG-23350
Change-Id: I30bf50fd216ee9894d0168e904cea1ed4251ec68
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
5 years agoRemove references to Q_WS_QWS
Girish Ramakrishnan [Wed, 20 Jun 2012 01:15:48 +0000 (18:15 -0700)]
Remove references to Q_WS_QWS

Affected code includes:
src/widgets/dialogs/qmessagebox.cpp
src/widgets/graphicsview/qgraphicsitem.cpp
src/widgets/kernel/qapplication_p.h
src/widgets/kernel/qwhatsthis.cpp
src/widgets/kernel/qwidget.h
src/widgets/widgets/qdockwidget.cpp

Change-Id: Ib9e920b3cc1253b39e4e00d7137c21321ecc0399
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoplastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIcons
Girish Ramakrishnan [Wed, 20 Jun 2012 01:03:47 +0000 (18:03 -0700)]
plastique: Use QPlatformTheme::DialogButtonBoxButtonsHaveIcons

Change-Id: I2f493d45820063ef62f16febde0df89a874dddb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoRemove dead code
Girish Ramakrishnan [Wed, 20 Jun 2012 00:58:29 +0000 (17:58 -0700)]
Remove dead code

Change-Id: I48c1e3b2ebcf4ec2fb21ed2d1a88e1dae64e937d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix QWidgetWindow sending duplicate drag-drop events
James Turner [Wed, 20 Jun 2012 12:55:40 +0000 (14:55 +0200)]
Fix QWidgetWindow sending duplicate drag-drop events

Unlike the other event handlers in QWidgetWindow, the drag-drop events are not followed by an
early return. This causes all drag-drop events to also be sent to the root widget of the window,
which is a bug. For example in the fridgemagnets example, where the target widget and
root widget are the same, the drop event is received twice.

Change-Id: I99e56ad8c48b3d31b0bd7c815cea8490edbf0af4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoRecord if a metatype is a smart pointer to a QObject derived.
Stephen Kelly [Thu, 24 May 2012 12:35:45 +0000 (14:35 +0200)]
Record if a metatype is a smart pointer to a QObject derived.

This allows QVariant/QMetaType software (such as QtDeclarative) to
deal with smart pointers in a similar way to how they can deal with
naked pointers (accessing properties etc).

This also adds a requirement that T be fully defined when
QSharedPointer<T> is inserted into a QVariant.

Change-Id: I29e12b8a6aa5f4aadbd62f92b89bc238f64b5725
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agoAdd some internal API for extracting a QSharedPointer<T> from QVariant.
Stephen Kelly [Sat, 9 Jun 2012 20:57:35 +0000 (22:57 +0200)]
Add some internal API for extracting a QSharedPointer<T> from QVariant.

The T must be derived from QObject, or it will fail to compile.

This will allow scripting or other 'wrapping' and runtime environments like
QtDeclarative to handle QSharedPointers to types derived from QObject
properly. A QSharedPointer<T> can be inserted into a QVariant, and
where T derives from QObject, a QSharedPointer<QObject> can be
extracted from the QVariant, and its properties are then accessible.

Change-Id: I68d6d89aceceb019267bd7301baa2047f9c09b90
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQNetworkAccessManager: delete the httpThread
Martin Petersson [Wed, 13 Jun 2012 06:59:35 +0000 (08:59 +0200)]
QNetworkAccessManager: delete the httpThread

The httpThread was using deleteLater the finished signal of the
thread to call the deleteLater slot. If the QNetworkAccessManager is
deleted when the application is closed then then fished is emitted
but we never return to the eventloop so the deletion is never done.

This will delete the httpThread directly instead of using deleteLater

Task-number: QTBUG-25487
Change-Id: I1fdbd4eca01e8bd8b3a98936298e5c78217752b4
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoChange *-clang mkspec globs to *-clang*
Bradley T. Hughes [Thu, 14 Jun 2012 05:14:05 +0000 (07:14 +0200)]
Change *-clang mkspec globs to *-clang*

Like with the numerous g++ mkspecs, we have mkspecs with suffixes, and
these mkspecs should still match the clang globs.

Change-Id: I9296408b5192bc72cc468d229a57923e3f5ab6f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agomkspecs: Add macx-clang-libc++ and macx-clang-libc++-32
Bradley T. Hughes [Wed, 13 Jun 2012 11:37:14 +0000 (13:37 +0200)]
mkspecs: Add macx-clang-libc++ and macx-clang-libc++-32

Use these mkspecs to switch to the new libc++ C++ runtime library, which
in turn makes it possible to enable C++11 support with clang.

Change-Id: If92908592f8bee4829a1bad747fe396f527d26c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agofix tst_QWidget::getSetCheck on Windows
Joerg Bornemann [Tue, 19 Jun 2012 16:10:28 +0000 (18:10 +0200)]
fix tst_QWidget::getSetCheck on Windows

Change-Id: Ie11a7576f8e618e2fedb31bd8071abb44b9f9f57
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agoFix unused parameter warnings in moc test.
Mitch Curtis [Wed, 20 Jun 2012 10:38:08 +0000 (12:38 +0200)]
Fix unused parameter warnings in moc test.

Change-Id: I3467a8bf99464c2d3762a171b20508bb4b29ddb4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agoMake QUuid compile with QT_NO_QUUID_STRING without breaking QDebug <<
Jeremy Katz [Mon, 18 Jun 2012 22:18:09 +0000 (00:18 +0200)]
Make QUuid compile with QT_NO_QUUID_STRING without breaking QDebug <<

Change I0cbb0581a1c3abefdde75b7cd45fdafd31640f0d breaks the use of
operator<< for QDebug, which shows up when trying to link QtCore in
the small qconfig.

Instead, render QUuid as "QUuid(QT_NO_QUUID_STRING)".

Task-number: QTBUG-24816

Change-Id: Ia52283d7461a9907bcec7a110e41c9f830895efe
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agodefine QT_NO_ICONV if QT_NO_TEXTCODEC
Jeremy Katz [Mon, 18 Jun 2012 20:08:00 +0000 (22:08 +0200)]
define QT_NO_ICONV if QT_NO_TEXTCODEC

This also updates qfeatures.h with various other things that have
been neglected. Run $QTSRCDIR/util/scripts/make_qfeatures_dot_h
after changing qfeatures.txt

Task-number: QTBUG-24816

Change-Id: I18b71fcec71efa9cfe3425fb1a7833456ec411b9
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoMake QVariant compile with QT_NO_QUUID_STRING
Jeremy Katz [Mon, 18 Jun 2012 15:18:13 +0000 (17:18 +0200)]
Make QVariant compile with QT_NO_QUUID_STRING

Task-number: QTBUG-24816

Change-Id: I76e6a6bcf1a2381e14f400648e3cb8ba554772a6
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoMac: Fix rendering of non-int sized fonts.
Eike Ziller [Fri, 15 Jun 2012 11:42:19 +0000 (13:42 +0200)]
Mac: Fix rendering of non-int sized fonts.

Scrolling happens in integer steps, so it's necessary to use a
fractional correction value.

Task-number: QTCREATORBUG-7127
Change-Id: I6eccba6532f95aa4bf9270bdaec4b57280dc8e3d
Reviewed-by: Matthias Ettrich <matthias.ettrich@nokia.com>
5 years agoDocument and use UserEvent::nullWindow for event delivery
Girish Ramakrishnan [Mon, 18 Jun 2012 21:51:14 +0000 (14:51 -0700)]
Document and use UserEvent::nullWindow for event delivery

nullWindow is used to track if the window was null when the event
was created. If the window was null at contruction time, the qpa
event delivery code will choose a window to deliver it to.

If the window was not-null at creation time but became null during
the actuall event processing time, the event is ignored.

All the event delivery except the touch event delivery has been
changed to reflect this. I have not changed touch event delivery
because I don't really know what all need to be retranslated into
new window co-ordinates.

Change-Id: Ic62d12a13e70dd4d01226509411817db1b6af108
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
5 years agoMerge "Merge branch 'buildsystem'" into refs/staging/master
Oswald Buddenhagen [Wed, 20 Jun 2012 08:34:13 +0000 (10:34 +0200)]
Merge "Merge branch 'buildsystem'" into refs/staging/master

5 years agoMake QDateTime::fromString()/Time::fromString() adhere to ISO 8601.
Mitch Curtis [Mon, 18 Jun 2012 13:53:30 +0000 (15:53 +0200)]
Make QDateTime::fromString()/Time::fromString() adhere to ISO 8601.

Currently QDateTime::fromString and QTime::fromString do not correctly
handle fractional minutes and, in some cases, fractional seconds.

In the case of reading fractional minutes, it has been decided to
ignore invalid characters outside of the 5 character portion that
we're interested in (see code comments in fromStringImpl() for
info on why we read 5 digits). The motive is that there is a
performance penalty for calling mid to get the portion of surplus
string and also for converting to it to a float. This is also in
line with what QDate does with surplus characters, for example.

Task-number: QTBUG-14418
Task-number: QTBUG-25387
Change-Id: Ib742fe80686aff3c3770b995678cf838fb4e3bb4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoClean up QDateTime tests.
Mitch Curtis [Fri, 8 Jun 2012 16:09:09 +0000 (18:09 +0200)]
Clean up QDateTime tests.

Clean up and consolidate different tests in tst_qdatetime.cpp
(that seem to be doing the same thing) into single tests.

Change-Id: Ib6ceb1cb7fb4c6eca672495f96d9cfd907853c85
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoAdd leading zeros to years below 1000 in QDate::toString().
Mitch Curtis [Fri, 8 Jun 2012 11:36:16 +0000 (13:36 +0200)]
Add leading zeros to years below 1000 in QDate::toString().

QDate::toString(Qt::ISODate) lacks prefixed 0's on years below 1000.
The ISO 8601 standard dictates that this should be the case.

Task-number: QTBUG-16476
Change-Id: I7e73152bba0f5894bcbaa3f4418732b74ce86bc5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUpdate calendarwidget example
Gatis Paeglis [Mon, 18 Jun 2012 10:01:57 +0000 (12:01 +0200)]
Update calendarwidget example

Due to API changes introduced by ff55d64f6788563a6ef9da2b6d0b6dc23bb936aa

Task-number: QTBUG-26130
Change-Id: I4e5bdf3dd81d75308a3e565239b9d7a95452cd43
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agoUse the POSITION_INDEPENDENT_CODE property on targets using Qt.
Stephen Kelly [Wed, 13 Jun 2012 20:26:30 +0000 (22:26 +0200)]
Use the POSITION_INDEPENDENT_CODE property on targets using Qt.

This property is only set if Qt is configured
with -reduce-relocations (which is the default).

Change-Id: If2f0ab92448f03bbc3f7c828d3bca60107229072
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoQUrl::setEncodedQueryItems should replace
Martin Petersson [Wed, 13 Jun 2012 10:38:51 +0000 (12:38 +0200)]
QUrl::setEncodedQueryItems should replace

If there is  already a query string present in the url. It should be
replace when setEncodedQueryItems is called again.

Task-number: QTBUG-26148
Change-Id: I2bd4e1f5d9b4161d64556062e97141888ad89b3b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoImproved QCursor::setPos() robustness on xcb.
Samuel Rødal [Wed, 20 Jun 2012 07:25:54 +0000 (09:25 +0200)]
Improved QCursor::setPos() robustness on xcb.

This makes tst_QGraphicsView::hoverLeave() less flaky.

Change-Id: Iaa1be6e2d02499679c69b26c07132413040173b6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
5 years agoAdd test for queued call of method with unregistered parameter type
Kent Hansen [Fri, 15 Jun 2012 11:39:28 +0000 (13:39 +0200)]
Add test for queued call of method with unregistered parameter type

Verify that this produces a warning containing the relevant typename.

Change-Id: I046c02585e410a211e9175600b1027dda83bdd9c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoQMetaMethod::invoke: Use normalizedType() to normalize return type
Kent Hansen [Fri, 15 Jun 2012 10:23:00 +0000 (12:23 +0200)]
QMetaMethod::invoke: Use normalizedType() to normalize return type

The code was probably written before QMetaObject::normalizedType()
was introduced.

The behavior is covered by the existing tests
tst_QMetaObject::invokeMetaMember and
tst_QMetaObject::invokeBlockingQueuedMetaMember.

Change-Id: Ib1c3b3e4dff37947defd1dfdcc860df44539aa3a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoAccessibility: Do not automatically add controllers
Frederik Gladhorn [Thu, 10 May 2012 19:36:24 +0000 (21:36 +0200)]
Accessibility: Do not automatically add controllers

While I do like the idea, it currently relies on every
QWidget having QAccessibleWidget as a11y representation.

This crashes for example when using the itemviews and
asking them for relations.

Change-Id: Ie15a78dae620eefb97c646b9e802b13bdf864650
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
5 years agoMOC: Avoiding MAX_PATH limit on Windows
Yuchen Deng [Thu, 14 Jun 2012 12:27:02 +0000 (20:27 +0800)]
MOC: Avoiding MAX_PATH limit on Windows

See: http://msdn.microsoft.com/en-us/library/aa365247(v=VS.85).aspx
Task-number: QTBUG-26157

Change-Id: Ie74481cd06c31149a060a432352da5b2731caaef
Reviewed-by: Debao Zhang <dbzhang800@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoFix compile-time error macro when building with -fPIE
Gabor Ballabas [Tue, 19 Jun 2012 11:24:43 +0000 (13:24 +0200)]
Fix compile-time error macro when building with -fPIE

This macro causes a compile-time error using LLVM with Clang
when the target that includes qglobal.h is built with -fPIE.

Change-Id: I2e82e1a8feed9009c814f187b06501b26ea3b3b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix access to uninitialized pointer
Tobias Hunger [Sat, 16 Jun 2012 20:52:03 +0000 (22:52 +0200)]
Fix access to uninitialized pointer

The C++ standard says in 9.4..2 that the object expression is evaluated,
so any compliant compiler may access d. So this syntax is a bug in this
place.

Change-Id: I37d2c4ea54febd40410ca473c906bcb1c66c4974
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agoAdd qMove macro to support std::move
Olivier Goffart [Wed, 25 Apr 2012 09:09:48 +0000 (11:09 +0200)]
Add qMove macro to support std::move

Change-Id: I373e07f479c11b172dab35ed7e5b62724aa50a1a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoWindows: Fix MinGW warnings.
Friedemann Kleint [Wed, 13 Jun 2012 14:14:40 +0000 (16:14 +0200)]
Windows: Fix MinGW warnings.

- Missing initializers for structs
- Missing enumeration value
- Mixing enumeration/ints in operator ?

Change-Id: I149ab01ad2ebd04f89e5c699905d5ba724828e0f
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
5 years agotst_qfilesystemmodel: increased test's permitted runtime
Rohan McGovern [Wed, 20 Jun 2012 01:03:58 +0000 (11:03 +1000)]
tst_qfilesystemmodel: increased test's permitted runtime

This test has recently timed out a few times on Windows test runs, with
no relevant changes to account for the timeout. Double the permitted
runtime.

Change-Id: I93765c9ea592973495bfe3a2f63e63ed615eb542
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
5 years agoMerge branch 'buildsystem'
Oswald Buddenhagen [Tue, 19 Jun 2012 14:48:23 +0000 (16:48 +0200)]
Merge branch 'buildsystem'

This appears to be fully backwards-compatible with all tested modules,
as far as CI is concerned.

Change-Id: I53f979d06d0a264c5aab1193bab181a38ab837d6

5 years agoFixed Wince Makefile environment
Bjoern Breitmeyer [Fri, 11 May 2012 08:24:28 +0000 (10:24 +0200)]
Fixed Wince Makefile environment

Integrated the checksdk tool into qmake and made
the makefiles selfcontained, so configure make, is now
enough to build qt for wince

Change-Id: I29076702eca2ec23d4d06bb3d5c5cef9d4f95161
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agomake missing qt modules fatal
Oswald Buddenhagen [Wed, 6 Jun 2012 11:01:45 +0000 (13:01 +0200)]
make missing qt modules fatal

there is no point in continuing; it will error out later (in more
cryptic ways) anyway.

Change-Id: I2562eadc2d91bfaa6e85368dc3774da31409a141

5 years agoless confusing wording
Oswald Buddenhagen [Wed, 13 Jun 2012 12:42:32 +0000 (14:42 +0200)]
less confusing wording

Change-Id: Ia509fe1a28de803673623d425f5949b35404598c

5 years agofix misnomer: qt_module.prf => qt_build_config.prf
Oswald Buddenhagen [Mon, 4 Jun 2012 15:10:11 +0000 (17:10 +0200)]
fix misnomer: qt_module.prf => qt_build_config.prf

qt_module suggests to be congruent to qt_plugin.

Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953

5 years agofix regexp in qmodule.pri inclusion check
Oswald Buddenhagen [Wed, 13 Jun 2012 12:36:32 +0000 (14:36 +0200)]
fix regexp in qmodule.pri inclusion check

this also allows us removing the redundant flag variable

Change-Id: If26d22280ce7bc2ef3514c7c11ce7cd9baec1293

5 years agorevamp automatic makefile generation for sub-projects
Oswald Buddenhagen [Fri, 18 May 2012 20:13:51 +0000 (22:13 +0200)]
revamp automatic makefile generation for sub-projects

instead of making the "real" targets depend on the makefiles, add
conditional makefile generation to the targets themselves.
this causes makefile generation to follow the recursion order determined
by the project, which is important when dealing with prl and module pri
files.
a side effect of this is that qmake and make calls are interleaved now,
which is entirely different from a 'qmake -r' run.

on the downside, calling make with multiple targets which operate on the
same subprojects without prior makefile generation will make a mess, as
the qmake calls will be racing. this should be no problem, as qmake does
not generate recursive targets where this would be useful - at least by
default.

it is not sufficient to just order the creation of the makefiles
non-recursively (e.g., by using gnu-specific order-only-prerequisites),
as an interrupted and subsequently resumed build would happily skip the
nested makefiles.
workable alternative approaches would be walking the entire tree in a
pre-pass to ensure makefile presence (which is incredibly slow) or
creating additional stamp files only after recursing and having the
makefiles depend on them (which is ugly).

Task-number: QTBUG-23376
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Change-Id: I88d3e7610215677d362026de316513d3bea04b06

5 years agosupport for private depends in modules
Oswald Buddenhagen [Thu, 19 Apr 2012 17:21:32 +0000 (19:21 +0200)]
support for private depends in modules

if a module's private headers add additional dependencies, QT_PRIVATE is
now the place to declare them. note however, that this may not contain
other private headers in turn - that would be much harder to implement,
and we want the explicitness anyway.

Change-Id: Ic516fcf1a003c95798df4fbe216f92016afaf47e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agointroduce $$QMAKE_CHK_EXISTS_GLUE
Oswald Buddenhagen [Fri, 18 May 2012 18:44:01 +0000 (20:44 +0200)]
introduce $$QMAKE_CHK_EXISTS_GLUE

instead of hard-coding platform differences, use a variable.

Change-Id: I20e98811ad5f07429148c6f88aedbabc3ba58fff
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agocentralize definitions of shell commands
Oswald Buddenhagen [Fri, 18 May 2012 18:22:42 +0000 (20:22 +0200)]
centralize definitions of shell commands

there are only two types. everything else is duplication.

Change-Id: I87f2bdd3d56b94bb2ecdb60e8861afeb9af3666f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agonormalize $$QMAKE_QMAKE
Oswald Buddenhagen [Mon, 23 Apr 2012 10:44:40 +0000 (12:44 +0200)]
normalize $$QMAKE_QMAKE

everything in the projects should be normalized. only the makefile
generators need to adjust it to the native form.

Change-Id: I06a4e997f32134d13949ec4a9dd1b44367aab7cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agocorrectly find idc even for makefiles
Oswald Buddenhagen [Tue, 22 May 2012 13:28:48 +0000 (15:28 +0200)]
correctly find idc even for makefiles

this is a qt tool, so it needs appropriate treatment

Change-Id: I0cb30ba07e03c72ee275cd916ca0a39a99fc3705
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>