summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* tst_qdeclarativepixmapcache: Remove CONFIG+=parallel_test and mark test as ↵Sergio Ahumada2012-11-021-2/+1
| | | | | | | | | insignificant Task-number: QTQAINFRA-574 Change-Id: Ib6df20784c12104a2f2a46ec4a7842e3af17271b Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* test: Mark tst_qhttpnetworkconnection as insignificantSergio Ahumada2012-11-021-0/+2
| | | | | | | Task-number: QTQAINFRA-574 Change-Id: I7d52efc8dc8a5a24d9269b12b48ea2d5583c3c6c Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
* Doc: Updated links on the documentation's headers.Jerome Pasion2012-11-025-23/+16
| | | | | | Change-Id: I4e13d27288ef50e7b9d04a12abbc299cb91a7501 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Mac: Correct writingSystem check value for ChineseLiang Qi2012-11-011-2/+2
| | | | | | | | | | | | | For simplified and traditional Chinese. Based on the Apple doc: Internationalization Programming Topics - Language and Locale Designations. (backport of commit edfb24009cf22a0f0277be5d595b48ef9af9c3bf from qt5/qtbase) Task-number: QTBUG-27130 Change-Id: I08969bfba17b6a2589dca5da83b668bb2d8f3e31 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Blackberry bearer plugin: Only Report working interfaces as activePeter Hartmann2012-11-011-3/+2
| | | | | | | | | | | | | | | | | Some interfaces might be connected but not working (e.g. no IP address, no gateway etc.) In practice, this prevents the USB interface (among others) from being reported as active and thus the QNetworkConfigurationManager as being reported as online. We only want Wifi and 3G etc. connections to be reported as online when they are up. (cherry picked from commit b9551c1b47277d58d86a82ce15501663257ed9a1) Change-Id: Ia175d701280db44a08b9535803a94806a5d6f30f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* correct spelling in commentMark Brand2012-10-311-1/+1
| | | | | | | Change-Id: I6ffa96ac9cda0701c99f839804f400a167fcf9a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> (cherry picked from qt5/qtbase commit 9b710bc13b9f8d8cf163d14d1f6e741e7851b06e) Reviewed-by: David Faure <david.faure@kdab.com>
* QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-314-1/+45
| | | | | | | | | | | | This option is opt-in (default: no). When configured with "-system-proxies", Qt automatically picks up the system proxies. (backport of commit f7893223e84db86dcdd860c625663d7006fcdad6) Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix QDBusServer with more than one connectionJan Arne Petersen2012-10-314-17/+44
| | | | | | | | | | | | | | | | Create a new QDBusConnectionPrivate for every new connection in qDBusNewConnection instead of creating a single QDBusConnectionPrivate in the QDBusServer constructor which gets assigned the latest connected DBusConnection in qDBusNewConnection (and loses track on all previous DBusConnections). Also extend tst_QDBusConnection::registerObjectPeer() test with multiple connections to the server. Task-Number: QTBUG-24921 Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0 (cherry picked from qtbase/a386194f9952683c0be5028f2b7f0ce9617fe404) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Updated and fixed win32-icc mkspec for ICC 12.1 or betterAlexey Ivanov2012-10-311-16/+18
| | | | | | Change-Id: I50653386b0abcb39bc50ea90b65201922460ee75 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix a crash in QFileDialog when selecting an invalid name filter.Friedemann Kleint2012-10-312-7/+54
| | | | | | | | | | | | When nameDetailsVisible is set to false and an invalid/empty string is passed to selectNameFilter(), the regexp used to strip the filter off the suffixes returns empty and a crash occurs. Change-Id: I926ea49514ff25a103977d8121fca1cf83d647f5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> (cherry picked from qtbase/d0aa81ee104107db1ce41a9bf0f91d4cb144f7de)
* Fix debugger detection when running on Linux.Friedemann Kleint2012-10-311-20/+28
| | | | | | | | | | Newer Linuxes have a symlink named 'exe' to the executable and 'cmdline' is empty. Task-number: QTBUG-27632 Change-Id: I45eb2186e2608e9600c4b6b27a033d8b1350deee Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make the examples test for QtDeclarative pass.Friedemann Kleint2012-10-317-51/+99
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state (using QTRY_VERIFY from shared/utils.h) and check for errors after loading again. - Exclude all broken examples. - Exclude shaders if import path is missing or OpenGL is not present. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
* Fix mmap usage.Jędrzej Nowacki2012-10-311-2/+2
| | | | | | | | | | Add missing MAP_NORESERVE and fix error checking. Special thanks to Olivier JG for debugging the issue. Task-number: QTBUG-27322 Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fixing font database memoryleakKarim Pinter2012-10-311-2/+2
| | | | | | | | | | | There is one case when the QFontEngine* fe is loaded, then FcPattern* match loaded from FcFontRenderPrepare is not deleted. Valgrind was showing this problem, after the fix there is no memoryleak in Valgrind. Change-Id: I8ef928fe8190a6d26f2e5275b85e08a7a8796a7b Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jiang Jiang <gzjjgod@gmail.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QNX: Remember information on whether a file is a linkThomas McGuire2012-10-311-0/+7
| | | | | | | | | | | | | This avoids an additional call to lstat() When using QDir::entryList() with the QDir::NoSymLinks flag. This is a backport of qtbase commit 03cd922e312428aca54892039da9ed79479cfa17 Change-Id: I5ef10c369ce6790c8d0de1346436f9ea7aaa4194 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* QNX: Use extra information in dirent to avoid stat() callsThomas McGuire2012-10-313-2/+69
| | | | | | | | | | | | | This improves iterating over /usr/bin with QDirIterator by more than half, from 36 to 13 milliseconds. This is a backport of qtbase commit 391d2e37f3b301097cd23fdaf99dc34ed6a114a5 Change-Id: I45e9159c82d1840f21dbab81fc39f140490549b7 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - fix minor bug in visualIndexAtThorbjørn Lund Martsum2012-10-312-2/+15
| | | | | | | | | | | | This fixes a minor bug in VisualIndex triggered when calling resizeSection with size 0 (but not hideSection). It is mostly cosmetics - but it is still a bug. This is a backport of SHA 73a5bc2aac7638438dfde260a4246359a06e89ae Change-Id: Ic3e1ce584d8befa501c670c085435248ebaa681b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - length returns wrong value fixThorbjørn Lund Martsum2012-10-312-0/+20
| | | | | | | | | | | | | | | | | | | | | | setSectionHidden called with (logindex, true) will sometimes not do a (correct) call to resizeSection(logicalIndex, 0) at once. However it does execute d->doDelayedResizeSections(). Therefore the section is going to be hidden later. However it is a problem that the length meanwhile is wrong. (That is a value that is not the sum of the sections) This is fixed by execute updates before returning the length. This is a backport of SHA 125016ad241125176e5bebab94eebcf50fac20bc Task-number: QTBUG-14242 Change-Id: Ia1d2f6db3213792b250a6a37942b56554261cd3a Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - no big update work if updates are disabledThorbjørn Lund Martsum2012-10-311-0/+7
| | | | | | | | | | | | | This is not a major boost, but still a nice optimization that can speed up hideSection and resizeSection with about 40% if updates are disabled. It is backport of SHA 3bb0c88de8894fc05ad1558b96ae05ceeff64b78 and a5201007f255a07f7ba07981745eeaec41a14a34 Change-Id: I33b83940003c391e5dae549353a6beb27928f92a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Corrected licensing info and links point to Digia in qmessageboxjutaipal2012-10-301-2/+2
| | | | | | | | Change-Id: I1051b20c287cba927b668290c46749c27edbde21 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update INSTALL fileIikka Eklund2012-10-301-7/+7
| | | | | | | | | Update the url's in INSTALL file. Change-Id: Id95b2f18a6afa7594e4ead2df449abd4f68cfd70 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update README fileIikka Eklund2012-10-301-9/+9
| | | | | | | | | Minor update into url's in README file. Updated also copyright. Change-Id: Ida5c8a0446cdca848fbf84700c3858eda97cfe56 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Blackberry: Fixes QWindowSurface::grabWidgetRafael Roquetto2012-10-304-5/+66
| | | | | | | | | | | | | | We are reading from the back buffer instead of the front buffer when grabWidget is called. This adds an override so that we query the front buffer (the last rendered frame). This change is not needed in Qt5 - the api there is different and grabWidget() no longer exists. Change-Id: I691ee589d56b60eab339de536b52fd90cee5ff85 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix for slowness of touch move eventsBernd Weimer2012-10-301-60/+46
| | | | | | | | | | | | | In the event dispatcher native events will be processed in a tight loop to drain the queue. IO events and timers will be postponed. Backported from c4b2d77f40a42a67480bb49aa63b0953c80c024a Change-Id: Iaf408425000e7fd6fdbf0992bbf927d03a650581 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* BlackBerry: Query dynamic buffer count at runtimeRafael Roquetto2012-10-302-2/+16
| | | | | | | | | | | | | While unlikely, there are cases in which QBBWindow::renderBuffer() is called before the window buffers have been created. Without this check, the program will abort on QBBBuffer constructor, since the value that will be passed to it will be of an invalid buffer. cherry-picked from qt5 c89dc4fdd2770ba3ad52303a2f4cb0c6403a2ecd Change-Id: I1f1cde76a364480f3bc77eaaa59ca3cfba2eb618 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Support other platform names on configure.exeRafael Roquetto2012-10-302-9/+68
| | | | | | | | | | | | | | | | | | | | | | | Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX, Blackberry, and Symbian*. Default platform name is "Windows". * Symbian is not present on the original Qt5 patch. Symbian is not supported on Qt5. cherry-picked from qt5 b87c5cff24229b1bcc77ac68699f2f03acabc9e7 Change-Id: I6a97e00d59cce36804c857aa57c5754a2f6277db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QNX: Use inotify on QNX systems that support itThomas McGuire2012-10-304-0/+25
| | | | | | | | This is a backport of qtbase commit fc0cbef59599174589a606838a9b55ba6a07ef06 Change-Id: I27ca7222ed0e622bdae405f0802ab29e22f4cbbf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry: Fix QCoreApplication::applicationFilePath() performance.Sergio Martins2012-10-301-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | Listing all files with QDir is slow. Instead, use argv[0] for zygotized apps and _cmdname() for non-zygotized. Apps run through the terminal will fall in the zygotized case, which is ok. Note about zygotized apps: Zygotized apps don't have an executable, they live in a shared object file. These apps are run through a deamon that forks and dlopens() the shared object ( for performance reasons ). For this reason we can't use _cmdname(), since it just contains the the file path of the daemon. On the other hand, non-zygotized apps have a bogus argv[0] when run through the navigator ( command line is fine ). Change-Id: I73d1cd742a70d1be36a8efe829671d6d7594a6fb Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QGLTextureGlyphCache: Fix text rendering artifacts on NVIDIAJonathan Liu2012-10-301-2/+2
| | | | | | | | | | | Check GL_VENDOR to test whether using NVIDIA graphics. On Linux, GL_VERSION and GL_VENDOR contains "NVIDIA". On Windows, only GL_VENDOR contains "NVIDIA". Task-number: QTBUG-27658 Change-Id: I5e74d07ecb9522d1a86ac2953415a51bbdbe8c49 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> (cherry picked from qtbase/8900bc778f326e6b22ecfceb0b0b64394f3510fb)
* Fixed GCC 3.4 build with sse2 enabled.Samuel Rødal2012-10-301-1/+2
| | | | | | | | | With minimal effort we can keep the GCC 3.4 build working. Task-number: QTBUG-19803 Change-Id: I31611a27b97d5ac426ea857d8f1b656dc6f5377a (cherry picked from commit 7d7f09650c3b3b2990f16ff4a6401a8c74e1f868) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't set QT_BUILD_DIR as a side effectOswald Buddenhagen2012-10-302-7/+10
| | | | | | | | | | | | | we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback, which would make qtPrepareTool() believe we were doing a qt build despite actually trying to build something against an installed qt. this would become apparent only when using a non-default directory layout, as is the case in our mac packages. Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix Qt network autotests against updated autotest server.Janne Anttila2012-10-301-64/+7
| | | | | | | | | | | | There is an updated version of Cyrus server available in Ubuntu 10.04 repositories. Installing autotest server now with puppet configs, results updated Cyrus server to be installed and "greetings" line it provides is not compatible with Qt 4.8 autotests. Use functions from qtbase, they don't require exact version of Cyrus. Change-Id: I4fd2f14ca9d51a992c129d2fcd9a6cc85fa10a1b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix tst_qhostinfo test case for Digia CI infra.Janne Anttila2012-10-301-2/+2
| | | | | | | | | | | | | | | Microsoft DNS server used in Digia hosted Qt-Project CI system, returns 'Server failed' error for hostname ending with dot. Because the purpose of this autotests is to test 'notfound' use case, it should is ok to use also 'invalid.invalid' hostname in these DNS queries. The similar chang in Qt5: https://codereview.qt-project.org/36871 In addition 62.70.27.69 IP address is not mapped to trolltech.com anymore. Update test to use qt-project name and IP instead. Change-Id: I11b0233109a6dc8b3de8e9783a287ce106436711 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix tst_qhttp autotest after Digia acquisition of Qt business.Janne Anttila2012-10-301-4/+4
| | | | | | | | | | | The autotest expected that qt.nokia.com would respond with "200 OK", but it currently responds with "301 Moved Permanently". Changed test case to use qt-test-server instead of qt.nokia.com. Because qt-test-server does not have developer subpage, changed PCT test case to use simple.html instead. Change-Id: I13430a1d79568a46085f53de49b50989a4fdc144 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Mark flaky tst_qlocalsocket autotest insignificant.Janne Anttila2012-10-301-0/+2
| | | | | Change-Id: I415c57aaf3454a9a40adc1dc51977386bada163a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* tst_qaccessibility: narrow QEXPECT_FAIL in textEditTestRohan McGovern2012-10-302-1/+3
| | | | | | | | | | | tst_QAccessibility::textEditTest no longer fails on Ubuntu 10.04 in CI. Restrict the QEXPECT_FAIL to only those platforms where it is known to fail. Task-number: QTBUG-26499 Change-Id: Ia12e81dbc0a94464c9916bedb4d29065781285c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fixed crash on destruction of animating QDockWidget in a QMainWindowRohan McGovern2012-10-302-2/+5
| | | | | | | | | | | | | | | | | | | | | It doesn't make sense to hold an unguarded pointer to a QPropertyAnimation while assigning ownership of that animation to the animated widget. Destruction of the widget while the animation is in progress causes the animation pointer to become dangling; then the widget is removed from the containing QMainWindowLayout, which attempts to abort the animation, dereferencing the invalid pointer. The crash can be reproduced sometimes with tst_QDockWidget::taskQTBUG_2940_resizeAfterUndocking (which is in Qt4 only). (cherry-picked from qtbase 33214af3784feacb2d5188bbf07da92f45f582f9) Change-Id: Ia886f64fdb6720914a46bc7f32c71cf4fc81c28d Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix tst_qsslsocket auto test build when OpenSSL is not available.Janne Anttila2012-10-301-0/+2
| | | | | | | | | This is needed to get Qt 4.8 CI passing. OpenSSL is apparently missing from Digia hosted Windows CI machines. OpenSSL to CI Testers will be installed later on to cover also these code paths. Change-Id: I6a4e2b4b1fa6c56692f112f1c5fc47361cb1ea0c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Marking networkselftest, qthread and qxmlquery insignificant temporarily.Janne Anttila2012-10-303-0/+6
| | | | | | | | | | | | | | | | | | | | | | These tests failed on latest Digia hosted Qt 4.8 CI builds (919 and 921), marking them temporarily insignificant to get CI passing. See task: QTQAINFRA-574 tst_networkselftest failed because there is no OpenSSL installed on CI devices. This will be fixed as soon as I have access to VMs and they are free from builds. tst_qthread and tst_qxmlquery timed out after default 450 seconds, I need to check how long these test take to complete in our environment to increase timeouts or is it actually so that execution of these tests freeze for some reason. I'm marking these insignificant for all platform for now, since I don't yet have test results from Macs. It might be that some of these tests fails also there. Change-Id: Ic6d7fb1b3c7951ff98c4fa84028450f0b2ba13fa Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Mark qsharedmemory insignificant since it is flaky.Janne Anttila2012-10-301-1/+1
| | | | | | | To be resolved after 4.8 CI is passing. Change-Id: Ic3def05f5cd538c19affea1dcec1f20df6cc1e3b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* qpa: Fix drawPixmap rendering using CompositionMode_Source in DirectFBJulien Brianceau2012-10-231-1/+3
| | | | | | | cherry-picked from qt5/qtbase d8c8057c03fc906f3bee0905246ca18351bd9e1b Change-Id: I6728307150c75a8e01f498cf55320a2956aa07ad Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* qmake: fix .pc install target dir separators on windowsJ-P Nurmi2012-10-221-1/+1
| | | | | | | | Task-number: QTBUG-26455 Change-Id: I578345b1676d0d2e812e0ab2e48468b4a8013ee9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from commit 3c05a0f3e7cad3ef4738eb11df4d427c8dbc13e8)
* QDeclarativeTypeLoader: Avoid stat() calls to . and ..Thomas McGuire2012-10-221-1/+1
| | | | | | | | | Not needed in Qt5, QDirIterator is not used there, Qt5 contains a completely new type cache. Change-Id: Ifb97cfda0589210783bccc65ab27a546e0f1fca8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* BlackBerry: Change base font sizes from pixels to pointsKevin Krammer2012-10-221-1/+3
| | | | | | | | | | | | | | Previously recommended fonts sizes in pixels do not work very well on the new high resolution devices. Current UX documentation recommends point size 8 for normal text which works well on both types of devices. Backport of qtbase 4d693b6cdf879a03f77f2a06ca0e1be5605c0fc0 Change-Id: I9507b77a5e814b33cf90e714ae62d64e468710b9 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Use the right properties when checking the frame's marginsAndy Shaw2012-10-222-4/+23
| | | | | | | | | | Changed it to check the Frame*Margin property instead of the Block*Margin property as this was incorrect for a QTextFrameFormat. Task-number: QTBUG-22173 Change-Id: I2c3066165fb592ed034874b1180593822859f933 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> (cherry picked from qtbase/d060620e6cd3c94e7e0ff809b21593b9c0da0be2)
* configure: state compiler explicitly when testing for supported flagsPeter Hartmann2012-10-211-7/+8
| | | | | | | | | | ... so we can test those functions with host and cross compilers. Additionally, make sure we check the host compiler for QMAKE_LFLAGS. (backport of commit 1da978416d89b86d92087e8dc51bdb305b6ed58c) Change-Id: Id3f5f55e3a9e6b3d0dc72f96aa136f64390d08a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QNX: only enable NEON instructions for supported architectures (ARM)Peter Hartmann2012-10-211-1/+1
| | | | | | | | | | | They are not there on x86. This change is not needed for Qt5. Task-number: QTBUG-27612 Change-Id: I385ed5b18b6985f796054acbf4fca2667942f8d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Doc: Update QThread class ref to reflect changes since Qt 4.4Sze Howe Koh2012-10-202-64/+127
| | | | | | | | | | | | | | | | | Remove advice to subclass QThread; promote thinking of QThread as a thread manager, not a thread; promote event-driven programming over time micromanagement; warn against common pitfalls. Result of collaboration in forum (https://qt-project.org/forums/viewthread/20691/) and mailing list (http://lists.qt-project.org/pipermail/development/2012-September/006738.html) This is a modified backport of qtbase commit d4ad9dbbf96884c0899e8f8116a8a056facd52d5 Task-number: QTBUG-16358 Change-Id: Ib7a8d40aa418b1d96e3e7070df074b396ae9ee7e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add a QNX 'quirk' to platformquirks.hNick Ratelle2012-10-201-0/+2
| | | | | | | | | | | | This patch is not needed by Qt5, since the code in question no longer exists. Change-Id: Iabda3ed35ff7adc4af0e6e189fd04dee12a04431 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Blackberry: implemented "orientation lock" widget attributeBernd Weimer2012-10-201-0/+14
| | | | | | | | | | | | Qt::WA_LockPortraitOrientation and Qt::WA_LockLandscapeOrientation will be adhered to. This is not needed in Qt5, as those attributes have been removed from Qt5. Change-Id: I5f29cad0e2c784caa6201b683d7b658a5b0d083d Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>