summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Close popups on non-client area mouse press.Morten Johan Sorvig2012-10-191-0/+11
| | | | | | | | | | | | | | Fixed QComboBox popup issue which was left open if window was moved(dragged) to another position. Task-number: QTBUG-1894 Task-number: QTBUG-26120 Task-number: QTBUG-26465 Task-number: QTBUG-26827 Change-Id: I7e37b37881cdf94574d79f7e77d36f5bbc15f732 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Make QtDBus work again with D-Bus 1.0 and 1.1Thiago Macieira2012-10-192-22/+9
| | | | | | | | | | | | The dbus_get_version function was introduced in 1.2, so we'd need to detect pre-1.2 by the absence of the function. But if we're going to detect the presence or absence of any function, we might as well do it on dbus_connection_can_send_type, which is the function we wanted anyway. Change-Id: I6e17a3a8f1382c6a489490084f6e3f61aa5a1947 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> (cherry picked from qtbase/0510fc149e0c6b955ee9b93917e72ee378369197) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove the -falign-stack option from ICC's mkspec.Thiago Macieira2012-10-181-1/+1
| | | | | | | | | | | | | | | | This option was necessary in early ICC 12 releases because of a difference in interpreting the ABI requirements with GCC. According to ICC devs, GCC changed the ABI on its own to require 16-byte-aligned stacks on i386. It looks like this option has been the default in later ICC 12 releases. At least 12.1 update 5 has it by default. ICC 13 does not have the option anymore but accepts it silently for backwards compatibility. (cherry-picked from qt5 change 76874dea4449029856a7a1f639b995a9e35c6166) Change-Id: Id8bb4c250718eef2f02dc97bd47a0efd95b272fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* GL Window needs to update after an orientation changeBernd Weimer2012-10-181-0/+1
| | | | | | | The qnx plugin in Qt5 is different, update is not needed Change-Id: I70cf6a0b091bd1f15795521397eb744401aff2c8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix a regression with regards to hfw behavior in QStackedWidgetJan Arve Saether2012-10-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression because we made QStackedWidget actually support heightForWidth in 4.8. This was done with change 4780f94e391b5e881497c5228661dead42c821fa. The problem was that heightForWidth was not calculated correctly because some of the pages were hidden. The hidden pages were actually not contributing to the hfw of the QStackedWidget at all. This again caused the QStackedWidget to change its heightForWidth() value when the current tab changed, which again could cause "jumps" in the UI when switching tabs (as demonstrated in the task). The problem was that the patch relied on calling QWidgetItem::heightForWidth(), and this function would return -1 if the widget was hidden. However, QWidget::heightForWidth() does not have this magic and returns the proper hfw value regardless of its visibility. One could argue about the correctness of this patch, but since QStackedLayout::sizeHint() disregards QWidgetItem::sizeHint() (it asks the widget directly), we do the same in QStackedLayoutHFW::heightForWidth() for consistency. In addition, QStackedLayout enforces that only widgets can be added to it, and you cannot add your own QLayoutItem subclasses to it: qWarning("QStackedLayout::addItem: Only widgets can be added"); Change-Id: I0196a9e8e3ef3a36ce0e1a2929dfd58edeb93c69 Task-id: QTBUG-24758 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix Drag and Drop with Native WidgetsJian Liang2012-10-181-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-27265 Don't check "dragOverWidget != widget" in QOleDropTarget::DragOver() because if the dropsite widget's parent widget is the drop target this check will prevent its parent widget receive drag over event and the dnd cursor indicator is also wrong. We replace the check with "!dragOverWidget->isWindow()" to prevent pass through a window. A similar issue in Qt5 beta has been fixed by https://codereview.qt-project.org/#change,35646 Change-Id: I9e18b71bd7f3ee244db61571811c51dc16b341d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Blackberry: Populating the QCoreApplicationDataFabian Bumberger2012-10-181-0/+47
| | | | | | | Backport of: 49f277482e86d21edf9a055229100486aaf8b4c0 Change-Id: I7549834efc86f834d549c9a4278f693a29b7ee11 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Revert "qmake vcxproj generator: map TARGET_EXT to $(TargetExt)"Joerg Bornemann2012-10-183-12/+2
| | | | | | | | | | | | | | | | This reverts commit 06f0d8a1a9a1d8d46e6f4f3894d76781dfb6638c. The insane logic that prepends the version number of a lib to TARGET_EXT instead of appending it to TARGET breaks every vcxproj with a library version. Fixing this properly will require much more work and testing on all supported Windows platforms. Therefore we're reverting the fix for QTBUG-26782 and mark it as "won't fix" for Qt4. Task-number: QTBUG-26782 Task-number: QTBUG-27554 Change-Id: I0e3d0f0f3976e9ca958574364ec1b2668e1f66f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry: Emit aboutToBlock() and awake() correctly in the dispatcherThomas McGuire2012-10-181-7/+31
| | | | | | | | | | | | | | On Blackberry, select() can actually temporarily wake up to process mative BPS events. Make sure to emit the aboutToBlock() and awake() signals in this situation accordingly. This is a backport of qtbase commit a1082dbc3f61f1747bd756f8fce2a54f558793ed Change-Id: If1bd1c300b037cb5dac1c96c68abbfb22188dd34 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QNX: Add and remove screens dynamically.James Turner2012-10-184-17/+90
| | | | | | | | | | | | | Backport from Qt5: Watch for display events from libscreen, and dynamically add and remove QPlatformScreens (and hence QScreens) in response. Qt5 commit: 1f0d430c3a660c9e72581b582fe16c440bcf9eac Change-Id: I65f69fc9eca5b32b0aa0e929d09837a6f01385d0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix XCode generator for qmake when generating for XCode 4.5 and laterAndy Shaw2012-10-182-1/+17
| | | | | | | | | | This is a partial cherry pick from Qt 5 just to include the specific changes needed to get qmake generated XCode projects working with XCode 4.5 or later. Change-Id: I879ca5684435289a61d8db248f2c3f64f6866a60 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/f6bd02317db7beadda1237df7feddd4a780415cb)
* Do not skip tst_QClipboard::copy_exit_paste on QNXRafael Roquetto2012-10-171-1/+1
| | | | | | | | | | This test is valid on QNX platforms cherry-picked from qt5 703fa6c361682cab0d64baabd9256c651da34779 Change-Id: I51c1d191cf8cdbde6239afc99019ca310bd2220a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* BlackBerry: Use real DPI instead of hardcoded valueKevin Krammer2012-10-171-16/+53
| | | | | | | | | | | | | | | | | | | | | Try to retrieve the device's real screen size and provide override options in case the target's low level stack reports wrong values. It can happen that the system is reporting a screen width or height of zero, if the system does not know the size instead of returning an error. You can either set a define QQNX_PHYSICAL_SCREEN_WIDTH/QQNX_PHYSICAL_SCREEN_HEIGHT or set it as environment variable QQNX_PHYSICAL_SCREEN_SIZE. The preference order is: 1) Take detected size 2) Take size from env var 3) Take defined size if any define is set Backport of 0b0e28997d5c0ec6fbffa839b0ceb57b55104f9c Change-Id: If24a5d32ec9081fe006344bf30bbb917418c9071 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* optimize loading of qconfig.pri & qdevice.pri somewhatOswald Buddenhagen2012-10-172-5/+5
| | | | | | | | | avoid some expensive operations. note that this uses exists() where !isEmpty() would be more intuitive, but isEmpty() does not work on magic variables in qt4. Change-Id: I904463eb1021d208c21fc602af3228350756ed4b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* rebuild configureOswald Buddenhagen2012-10-171-0/+0
| | | | | | Change-Id: I97c71a3f9a2190edeac7c21f873b1140729e3d81 Reviewed-by: Juhani Taipale <juhani.taipale@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fixed cosmetic line drawing where begin and end points are equal.Samuel Rødal2012-10-172-0/+26
| | | | | | | | | | | This case has typically required specific work-arounds in other rendering paths as well. (cherry picked from commit dfb55f8a6c8d3ec4da840191c331ace3c2aa2bf3) Task-number: QTBUG-25153 Change-Id: I217e710a30222792ebca3bf297e438d944c32992 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QComboBox: mention insert policy in context of editable propertyMark Brand2012-10-171-1/+4
| | | | | | | | | This makes it a little bit easier for the reader to discover what editable combo boxes are about. Change-Id: I60ce571f01e32d4cacb4718b42a8e12884bd1c13 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qt5/qtbase commit a5e7c2802af59d4940e3479288cb9346205b984c)
* QComboBox: replace homebrew with QSignalSpy for editTextChanged testMark Brand2012-10-171-35/+12
| | | | | | Change-Id: Id4c81ae71d6dc87f9ad7cfb99a89d335162e1f75 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> (cherry picked from qt5/qtbase commit e437051ff51d57bcc6937dc23fe6a77bf9897130)
* QtSql: Correct documented default precision policy.Mark Brand2012-10-171-8/+4
| | | | | | | | | | Follow-up to commit c9f77564df14f91276e9ca693a9b3f339dab9334 Task-number: QTBUG-27482 Change-Id: I17c12ee14d4609bccbe67bba2581f13d72c069ae Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qt5/qtbase commit 7a34e88edcc8b05744cede732f79f99acaad75ef) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* correct spelling in QtSql documentationMark Brand2012-10-171-1/+1
| | | | | | | Change-Id: I69e4178bbe967a70b1141122639883b5cbacd924 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Bill King <bill.king@nokia.com> (cherry picked from qt5/qtbase commit f8cfb4bebd331ca950511570d141c5ec9172c7e6)
* QComboBox::currentText: correct documentationMark Brand2012-10-171-3/+6
| | | | | | | | | | | | | | The documentation previously neglected the fact that the current text can be provided by the embedded QLineEdit if the combo box is editable even if there is no selected item. Change-Id: If40868c1633af7ce81b437d29e1da3fd4fefafb0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Adam Light <aclight@gmail.com> Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from qt5/qtbase commit 8d56ed85bdce40bca7b8457527103988efb3afcd) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* lancelot: detect and handle Jenkins CI environmentRohan McGovern2012-10-161-0/+8
| | | | | | | | | | | | | | | | | | | | Make the test behave in Jenkins similarly as it behaves in Pulse: - a test run in Jenkins is not an ad-hoc run - the JENKINS_HOME environment variable implies we are running in Jenkins - the GIT_BRANCH environment variable, set by the Jenkins git plugin, is equivalent to PULSE_GIT_BRANCH - there is no equivalent to PULSE_TESTR_BRANCH, since testr is no longer used Change-Id: I89ffeec659b4adaab309d8b93ad793ce640029c7 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from qtbase/efdc35b680f2700b0326f10708337ff52ddcc143) Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Mangle QNSApplication and methods into a namespaceYan Shapochnik2012-10-152-13/+16
| | | | | | | | | | | Ensure Qt's native implementation of sendEvent: calls the proper Qt event filters and passes them along to the correct QApplication instance thus guaranteeing that macEventFilter() is properly called when a non namespaced and a namespaced Qt exists in one process. Change-Id: I61543d6ef68b09cfb40c9d263aaaf5ead5ece24b Reviewed-by: Yan Shapochnik <shapochniky@seapine.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mangle QNSApplication into a namespace when Qt is configured as suchYan Shapochnik2012-10-153-3/+3
| | | | | | | | | | | | | | Ensure the correct QNSApplication is referenced when multiple Qt instances exist in a process. This will also prevent the following messages from being displayed in the console "Class QNSApplication is implemented in both /path/to/QtGui.framework/Versions/4/QtGui and /path/QtGuiNamespaced.framework/Versions/4/QtGuiNamespaced. One of the two will be used. Which one is undefined. Change-Id: I22e7f06aa35e9daecf2e9c881268baf92d35022c Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
generated by cgit v0.12 at 2025-01-13 18:45:28 (GMT)