summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't flush qmake command line twiceOswald Buddenhagen2013-02-013-7/+10
| | | | | | | | | otherwise variable assignments (including -config options) from $QMAKEFLAGS are lost. Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* tests: Fix some more old references and links to NokiaSergio Ahumada2013-02-0115-154/+154
| | | | | | | Task-number: QTBUG-28156 Change-Id: Ifb768b167203c901c5e42ce58c9aaf3db2739320 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-02-0192-385/+1209
|\
| * Merge branch 'release' into stableSergio Ahumada2013-01-3192-385/+1209
| |\ | | | | | | | | | Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
| | * don't create forwarding module pris for non-prefix buildsOswald Buddenhagen2013-01-311-62/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as everything is built inside the common build/install dir, there is no point in the fwd pri stuff. as a "side effect", this makes it more straight-forward to relocate non-prefix builds, which is the default on windows. Task-number: QTBUG-28827 Change-Id: I010246a9ad87cf74974dc168768b1a8625f73260 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * qt_module_fwdpri.prf => qt_module_pris.prfOswald Buddenhagen2013-01-312-60/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | move the regular pri file creation into the "sub-prf" and rename it accordingly. the original reason for the split was the deep magic in activeqt (and phonon), which is gone now. Change-Id: If40e941afc9293725630ed6bcf3e4ef18a692f66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * centralize detection of prefix buildsOswald Buddenhagen2013-01-315-6/+9
| | | | | | | | | | | | | | | | | | | | | this makes the use sites more expressive Change-Id: Ib879de65d1cc26462fa61f5339e951f294515faf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * fix install locations of examples/widgets/toolsOswald Buddenhagen2013-01-3118-18/+18
| | | | | | | | | | | | | | | | | | | | | amends cb961007c5 Change-Id: I725042c55816832eeb5b0d8a3522911877279aae Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * do not actually build examples in production buildsOswald Buddenhagen2013-01-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -developer-build enables an actual build of examples, based on the assumption that developers want to test it (it can be still disabled with -nomake examples). regular users otoh want only the examples sources installed. Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * push feature conditionals down to subdirectoriesOswald Buddenhagen2013-01-3112-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | the top-level project is not installed, and the meta-project which is used instead does not know anything about conditionals. Task-number: QTBUG-28414 Change-Id: Id5785ab5f92373ece74699e3c28220fc7f9689ac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't build shared demo library which is not used anywayOswald Buddenhagen2013-01-312-46/+7
| | | | | | | | | | | | | | | | | | | | | | | | this amends 5a2fc03ef4 Change-Id: I42b2141ad33b75041ee2bb58af642fc3d07f290e Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * fix duplicated installation of qml example filesOswald Buddenhagen2013-01-311-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | we need to collect the sources of the install targets for the check that all files have been properly handled, but of course we must not add these files to the source install target, as that would mean double installation. Change-Id: I6acb56f2a993b6ed81d1031d5dc0a0da30a53b54 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-281-4/+90
| | | | | | | | | | | | | | | | | | Change-Id: If32a0e76606dc887a133fe55dc1154ca512b0218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Fix documented signature for QtMessageHandlerKai Koehne2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29352 Change-Id: I46190a59cd73e53e778551a2d33c6b2801e9587e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix overquoting of GNUPATHOswald Buddenhagen2013-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28841 Change-Id: Ifa62a273acefc240953633bbd099384a635f29c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * explicitly set QMAKE_PKGCONFIG_NAMEOswald Buddenhagen2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise qmake will just take TARGET and lowercase and capitalize it, which not only looks weird, but also does not match the Requires: fields we generate. Change-Id: I4a070ff256fffd2b780acb0361d4213d0032dbb9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * include all module dependencies into pkg-config Requires: fieldOswald Buddenhagen2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, we'd miss the -private ones (which imply the non-private version). Change-Id: Ib5ae2afaa5b5efda9639b7cc4a080432f2fcce2a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Fix warnings about files that can't be found in QtConcurrentSergio Ahumada2013-01-285-5/+5
| | | | | | | | | | | | | | | | | | | | | Change-Id: I712e3de68bd329fc5e615b08278e719619f856b2 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * testlib: Remove old 'Partner Directory' external linkSergio Ahumada2013-01-281-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reference was removed by dc0d5bf387a0b440c74b9e822c46b09e20e00720 Change-Id: I941dbd24815caf7f2f33e757215815d9ca4e581c Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Fixing snippets and input file for a Qt Core article.Jerome Pasion2013-01-285-5/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -copied snippet and input files from Qt Widgets. -adapted new paths in the resource-system.qdoc file. -removed the old path entry in qdocconf. Task-number: QTBUG-29101 Change-Id: Ieeb118106756a1a39890ab219294de18f437c56c Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| | * Fix some more old references and links to NokiaSergio Ahumada2013-01-2829-65/+65
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: correct name of file with snippetNico Vertriest2013-01-282-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet not showing because qdoc read wrong snippet file. Due to 2 files having the same name. One was renamed: rsslisting.cpp --> listing.cpp Task-number: QTBUG-29101 Change-Id: I62b7eee6f2860613ee90538d8dea006b89000317 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * use correct module names in pkg-config Requires: fieldOswald Buddenhagen2013-01-281-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29309 Change-Id: Id22d4e2707ceb3421dc6eb5effe16a03c4769d26 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Remove out-dated duplicate logic from qgl.hSean Harmer2013-01-271-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use the updated logic for #including the correct GL headers already implemented in QtGui. This is needed to fix compilation of QtOpenGL on CentOS 5.8 and RHEL. Change-Id: Ifdedd13885566016073538f33aa6daf5902c3497 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Prevent GL/gl.h from including system glext.hSean Harmer2013-01-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to then use the up-to-date qopenglext.h header on Linux too. Some distro's are not yet shipping OpenGL 4.x compatible headers. This fixes compilation of Qt on CentOS 5.8 and RHEL Change-Id: Ia8022e0aaf215dac7ea2a23dc82c3ac117d9fd53 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Doc: corrected path used for snippets.Nico Vertriest2013-01-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Added "../../../" to snippet command in gestures.qdoc Task-number: QTBUG-29101 Change-Id: Ie1d58355f43bcd939f6a178c64ab008b288af747 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: added snippet file macmainwindow.mmNico Vertriest2013-01-252-1/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected path for snippet command Now refers to doc\snippets Removed trailing space Moved macmaindow.mm to src/widgets/doc/snippets Task-number: QTBUG-29101 Change-Id: If60c31909b2f5efad10ac8b735164a80522dcf62 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: deleted short paragraph referring to non-existing snippetNico Vertriest2013-01-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reference to section 1, which does not exist. Task-number: QTBUG-29101 Change-Id: Ifd5ac58080033ea1d3f0a587f48f9510f24e75b1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Printer support needs user32.lib and gdi32.lib on WindowsPeter Kümmel2013-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28765 Change-Id: Ia43076e07adee38dfe20f8d25eb223bb6ea6ef51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | avoid that we accidentally initialize XQMAKESPEC to an empty stringOswald Buddenhagen2013-02-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | there is plenty of tests which rely on the non-presence of the variable, rather than it being empty. Task-number: QTBUG-29400 Change-Id: Ifa8aa68192750521869767e2d4d3796794f4d8f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | remove somewhat pointless conditionalOswald Buddenhagen2013-02-011-2/+1
| | | | | | | | | | | | | | | | | | | | | if the user just set an empty spec, everything will go wrong anyway. Change-Id: I5ddaa2f0be1be96132260af8c869ba38e02eb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | remove versioned config backwards compatibility hackOswald Buddenhagen2013-02-011-13/+3
| | | | | | | | | | | | | | | | | | | | | the vendor string was changed, so compat is broken anyway. Change-Id: I07241843237ce28bd7a869bb4170c7e4c8d084df Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-0112-47/+54
| | | | | | | | | | | | | | | | | | Change-Id: Ie57765c10a8e90d6fc74ee5a8fd84bfc7cd8bcf2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Correct QTextEdit detailed description.Mitch Curtis2013-02-011-4/+8
| | | | | | | | | | | | | | | | | | Change-Id: Ie5c4769c864d9dfdc1cb4ed5d2cbfb9951df582b Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Let ICC 13 build Qt again if the system compiler is GCC 4.7.Thiago Macieira2013-02-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 4.7 has new builtins in x86intrin.h that ICC 13 does not (yet) understand, causing compilation errors. /usr/lib/gcc/x86_64-redhat-linux/4.7.2/include/adxintrin.h(36): error: identifier "__builtin_ia32_addcarryx_u32" is undefined Change-Id: I1845ccc3bf3ac15aef063bc3f998c5839fa51866 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | QNX: Don't crash if we unplug the primary display.Sergio Martins2013-01-311-3/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The QPA plugin assumes in several places that we have at least one QScreen. Even if patching the plugin to support 0 screens, Qt itself crashes when dereferencing a null paint device while synching the backing store. Change-Id: I2ac504a447aff811d6c07ab857340a3433557cdc Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | BlackBerry bearer plugin: check whether device is online several timesPeter Hartmann2013-01-312-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is supposed to workaround a race condition in the underlying netstatus API: Sometimes we get an event that the Wifi interface changed, but it is not up, e.g. no gateway (yet). In that case we need to check back (currently: 300 ms) whether the interface has come up or not. This commit can be reverted again once the race condition in the netstatus API has been resolved. Task-number: QTBUG-29421 Change-Id: I215ce8aae4848b6e942e77c6425adba90e9cc526 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Clean up logical dpi for QImage.Morten Johan Sørvig2013-01-313-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert to the pre highdpi-patch behaviour. Before, both physical and logical DPI would be based on the dpmx/dpmy variables, which could be changed with setDotsPerMeter(). The highdpi patch introduced separate ldpmx/ldpmy variables, which were not changed by setDotsPerMeter(). This broke when loading images: setDotsPerMeter would be called but the logical dpi would not change. Remove ldpmx/ldpmy. Keep scaling the physical dpi by the devicePixelRatio, which will be set to 1 by default. Task-number: QTBUG-29187 Change-Id: I0d6f5f3b8efae5fb1adc0a50b22a5da78324a282 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | update ofono APILorn Potter2013-01-312-20/+70
| | | | | | | | | | | | Task-number: QTBUG-29381 Change-Id: I952b73d86b4e8f497b4ff90d10c1f5312882bd8a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Windows tray icon: Fix reinstalling after restart of Explorer.Friedemann Kleint2013-01-302-12/+32
| | | | | | | | | | | | | | | | | | | | | | Use a normal instead of a HWND_MESSAGE-window since the latter do not receive the "TaskbarCreated" message. Provide an invokable slot in the native interface to register a window class for that purpose. Task-number: QTBUG-29160 Change-Id: Ic25222d08d21867f7d882a9e19d8aaf50f3f47cf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | fix path adjustments in installed metafilesMark Brand2013-01-303-0/+25
| | | | | | | | | | | | Task-number: QTBUG-28902 Change-Id: Ia70da8f0f0b7abb4ea2a46cb4068c0827888b322 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | adjust paths in installed prl files for mingwMark Brand2013-01-302-2/+2
| | | | | | | | | | | | | | | | | | Curiously, qmake could fix .prl and .pc files for unix, but only .pc files for MinGW. qt_module.prf seems to have known this. Task-number: QTBUG-28902 Change-Id: Ice9983a69813690c0d4b96ca11589440182569a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | adjust paths in installed module metafiles from modular buildMark Brand2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Fully modular prefix build now puts the includes and libs into each module's own builddir, so the else branch was simply bogus. Replaced the else branch with the real base for modular builds. This allows the paths to be successfully replaced when installing metafiles. Change-Id: I056a923288965b560a4e9b0ba7add1aac912199f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix angle sub-target nameOswald Buddenhagen2013-01-301-1/+1
| | | | | | | | | | | | Change-Id: I4dc374f96d492f75aee3724eadbd95626fa7a6d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | purge broken line continuation parsingOswald Buddenhagen2013-01-301-6/+0
| | | | | | | | | | | | | | | | it would have taken only the last line, which is clearly wrong. as nobody noticed this, the handling is clearly not needed. Change-Id: I6f4f45ce8c90cb9b0ef60abbaa5ed49b54d8b47d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Cocoa: prevent scale factor value of 0.Morten Johan Sørvig2013-01-301-1/+1
| | | | | | | | | | | | | | | | Check that the NSWindow pointer is valid before calling backingScaleFactor. Change-Id: Ia23cbb4058b7d0fece008bc437f8bfec6c0ddebe Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Doc: Fix references to Qt TestSze Howe Koh2013-01-3012-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtTestLib and QTestLib don't exist. The proper name is "QtTest" (code) or "Qt Test" (English) http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation http://lists.qt-project.org/pipermail/interest/2012-December/005221.html Files paths in qttestlib.qdocconf can't be changed easily however, as it breaks things. So, they're left as they are. Change-Id: Ifbc44ea858c453bedad8cd7723f847e67fc7a85a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | test: Add bic data for linux-gcc-amd64Sergio Ahumada2013-01-293-0/+24692
| | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I449d51088d3e5bfc6f92f036d498a2ef6f7a46b2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Mac: Ensure the native filedialog sets file name when savingLiang Qi2013-01-291-0/+2
| | | | | | | | | | | | | | | | | | The name field string was not set in native dialog when one was present. Task-number: QTBUG-28342 Change-Id: I243b491c8bc094d45f25be96b3bde8eccbb65acd Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Mac: make windows not restorable on 10.7 and laterLiang Qi2013-01-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value for NSWindow::setRestorable: is true, it means application will have some information for each window stored. After a crash happened and application relaunched, the application tries to restore those windows from the broken file. And then the "Retore Windows" will pop up. There is no workaround for application users or develoeprs. What they can do is to manually remove the the saved application state file for the applicaiton. To avoid that, better to switch it off. Task-number: QTBUG-28281 Change-Id: I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 20:50:24 +0000