summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove input plugins hard libudev dependencyBhooshan Supe2012-04-1210-7/+34
| | | | | | | | | | libudev extends the base functionality of these plugins but should not be mandatory as it is missing on many embedded devices that still actually require input devices (keyboard and/or mouse and/or touchscreen) support Change-Id: Ieeb949f1af5e774578f689a63f47a8c48f546ac1 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Add device support for Trident's ShinerBhooshan Supe2012-04-122-0/+109
| | | | | | | | | Add mkspec for the Trident's Shiner platform to be used in conjunction with the -device support in configure. This allows you to build Qt Change-Id: I68d8e8eb78f073e98f72207e9c5de6a0da0ed35d Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add device support for STMicroelectronic's ST7108Bhooshan Supe2012-04-122-0/+78
| | | | | | | | | Add mkspec for the STMicroelectronic's ST7108 platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by STM SDK 35. Change-Id: I36aa174200f034ccd6ee285e3f8a8ffec99b3e70 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Add device support for STMicroelectronic's ST7540Bhooshan Supe2012-04-122-0/+90
| | | | | | | | | Add mkspec for the STMicroelectronic's ST7540 platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by STM SDK 36. Change-Id: I4369b23b9a0c9063417e5cc71969f65e967e4019 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove Qt 5 to-do comment that will not be addressed.Jason McDonald2012-04-121-1/+0
| | | | | | | | | The suggested behavioural change had the potential to break existing code, so the change won't be made for Qt 5. Task-number: QTBUG-25119 Change-Id: Ie03271d12b21a800c998e073eeb9ca1cd03ffe19 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Cocoa: Proper handling of mDelegateChristoph Schleifenbaum2012-04-122-0/+8
| | | | | | | | | | | | | mDelegate keeps the pointer to a QNSFontPanelDelegate, which reacts on the NSFontPanel used by this dialog helper. It has to be created before it can be used. On a read-only access, this has been fixed to return a default-constructed value (like QFont()). For writing access (like setting the font) the delegate was already created. The same applies to mDelegate to QNSColorPanelDelegate respective. Change-Id: I36b89c16d98db9275aa31d399fe094b1d56d800d Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix ownership / lifetime of QCocoaNativeInterfaceJames Turner2012-04-122-1/+3
| | | | | | | | Change-Id: I21dd1e3186e0dbbc60294f807de0db6aad8b9eee Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-121-1/+3
| | | | | | | | | | | | If VC++ 2010 Express and VC# 2010 Express are installed, then the installation path is written in two places into the registry. We're now filtering detected installations with the same installation path. Task-number: QTBUG-24956 Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge "Merge commit 'qt-v5.0.0-alpha1'" into refs/staging/masterRohan McGovern2012-04-120-0/+0
|\
| * Merge commit 'qt-v5.0.0-alpha1'Marius Storm-Olsen2012-04-110-0/+0
| |\ | | | | | | | | | Change-Id: Iad20a9a374d7cf13b88e722b405cc5c2ddbc78ac
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1Simo Fält2012-03-2930-639/+805
| | |\
| | * \ Merge remote-tracking branch 'origin/master'Simo Fält2012-03-2823-349/+404
| | |\ \
| | * | | Windows: Fix handling of -nomake.Friedemann Kleint2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to list of disabled build parts (see b9a498bf514255b2a6298f44801d3d43c958044c). This fixes the tests are currently built in developer-build despite "-nomake tests". Change-Id: I43282112e03328dd89d8c874ca31b0483742ddb3
* | | | | Fix tst_qtextedit and remove insignification.Friedemann Kleint2012-04-112-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The crash on XCB can no longer be reproduced. - Use QFINDTESTDATA instead of SRCDIR defines. - Remove Windows CE specific profile section. Task-number: QTBUG-20756 Change-Id: I6077b3a0daacb15ab440a90c7bda247aa3756fa5 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | | | fix QUtf8 codec to disallow codes in range [U+fdd0..U+fdef]Konstantin Ritt2012-04-115-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xfdef-0xfdd0 is definitely 31 and not 15 :) also fix all copy-pastes of this code (greping for '0xfdd0' helps ;) Change-Id: I8f3bd4fd9d85f9de066f0f5df378b9188c12bd48 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* | | | | Update Qt 5 to-do comment in QDom.Jason McDonald2012-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change discussed in the comment doesn't have to be done in a major release if it isn't source-incompatible. Task-number: QTBUG-25103 Change-Id: I50036ab13611871ede01b7b7a17ce4c325476b00 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | | Minimally resolve Qt 5 to-do's in QXmlSimpleReaderJason McDonald2012-04-112-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-25104 Change-Id: Ic5200e2671f60f314d68ef5b341073e04d690c00 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | | Remove insignification from tst_qgraphicsgridlayout.Friedemann Kleint2012-04-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crash on XCB can no longer be reproduced. Task-number: QTBUG-20756 Change-Id: I057231a397573f2a28a1325c6d6f728735ebbee6 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | | | Remove Qt 5 to-do comments from qgraphicslayoutitem.h.Jason McDonald2012-04-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Neither of these comments will be actioned for Qt 5: the first because would be source-incompatible with Qt 4, the second becuase it would be a significant behavioural change. Task-number: QTBUG-25090 Change-Id: I5f8f7cce3007c3188b2f0184138fa8e55a165654 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | | Minor doc fix - show -> hide in QWindow::hideEvent()Julian de Bhal2012-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I91c5b7f7b688c4f99c6a364692fd96603a38c9bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | | | configure: add -pkg-config option to control pkg-config usageGirish Ramakrishnan2012-04-111-46/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, for host builds, pkg-config usage is autodetected based on it's availability in the mkspec or the PATH. For xcompile builds, pkg-config is disabled unless -force-pkg-config is passed. -force-pkg-config is poorly named since it doesn't reflect the fact that it applies only to xplatform builds. It is in fact the only way to enable pkg-config in xcompile builds. And when passed, it doesn't actually force anything since all it does is check env variables. To add to the confusion, it prints a warning even if the env variables are setup correctly. This patch remedies the situation. It adds (-no)-pkg-config. The flag works for both host and xcompile builds. By default, the value is 'auto'. In this mode, it will try try to detect pkg-config from the path. If found, it will be used. For xcompiled builds, we use some heuristics to determine if the pkg-config is actually usable: 1. if -sysroot is not set and the environment variables PKG_CONFIG_LIBDIR or PKG_CONFIG_SYSROOT_DIR are not set, we disable pkg-config. 2. if -sysroot is set, then we setup PKG_CONFIG_LIBDIR and PKG_CONFIG_SYSROOT_DIR automatically (provided $SYSROOT/usr/lib/pkgconfig exists). If the value is 'yes', configure will error if it's heuristics fail to detect a usable pkg-config. If the value is 'no', pkg-config usage is disabled. If the value is 'force', configure will skip it's heuristics and use pkg-config anyway. This mode is useful, for example, when compiling for 32-bit on 64-bit systems. This change also removes references to PKG_CONFIG_SYSROOT (PKG_CONFIG_SYSROOT_DIR is the correct environment variable). Change-Id: I07fc8d48603c65a60de0336fc6276e90fcb41430 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Propagate window state changes to QWidget.Friedemann Kleint2012-04-111-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the state in QWidgetWindow and send an event to the widget unless the code is triggered by QWidget::setWindowState(). Change-Id: Ibf2f4e730384e41636841b9216eecfdff35b7bcb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | XCB: Compress window state change events.Friedemann Kleint2012-04-112-78/+97
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Avoid sending Window State change events from WM_STATE/NET_WM_STATE changes irrelevant to Qt::WindowState. - Introduce QFlags for the NetWmState getter and setter to avoid passing QVector<> around. Change-Id: I74730928c7fffca0fa1cab3b90ded90b06304c06 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | QWidget: allow modal top-levels to have WA_DontShowOnScreenBradley T. Hughes2012-04-111-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a modal top-level widget has WA_DontShowOnScreen set, we need to call QGuiApplicationPrivate::showModalWindow() and hideModalWindow() ourselves, since we will not be calling QWindow::setVisible() (which would normally do the call for us). Change-Id: I1b22dd177c5956a2290f3ee031c95ab50d88f153 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | Add tst_QGuiApplication::modalWindow()Bradley T. Hughes2012-04-111-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tests that modalWindow() returns the expected value and that QEvent::WindowBlocked and QEvent::WindowUnblocked are sent correctly when modal windows are hidden and shown. Change-Id: I872f35e0240c928566ab35fa5764fad6cfda6db6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Implement window modality in QtGuiBradley T. Hughes2012-04-119-146/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWindow already has windowModality() and setWindowModality() as part of its API from commit 516f4e283ba4626d7239630397ef867ab0366071. Platform plugins can use this already to setup modality hints on windows that they create, but it's not enough to implement modality fully. QGuiApplication gets a modalWindow() static method, which is similar to QApplication::activeModalWidget() in that it returns the last modal window to be shown. The modal window "stack" moves from QApplicationPrivate to QGuiApplicationPrivate. The enterModal*() and leaveModal*() functions in QApplicationPrivate are removed and replaced by QGuiApplicationPrivate::showModalWindow() and hideModalWindow(), which are called by QWindow::setVisible() just before calling QPlatformWindow::setVisible(). The virtual QGuiApplicationPrivate::isWindowBlocked() will tell us if a window is blocked by a modal window (and tell which modal window for any interested callers). The default implementation works on the QWindow level. QApplicationPrivate reimplements isWindowBlocked() and adds popup and WA_GroupLeader support. QGuiApplication uses the state set from isWindowBlocked() to block user-input events: mouse press, mouse move, mouse release, wheel, key presses, key releases, enter/leave events, close events, and touch begin, update, and end events. Note also that the modality helper functions in QtWidgets and QApplicationPrivate are left in place and working as they always have. The behavior of QWidget in the presence of modal windows/dialogs should not change. Change-Id: I2c89e6026d40160387787a6e009ae1fdc12dfd69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | Don't crash when comparing values containing empty arrays/objectsLars Knoll2012-04-113-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-25164 Change-Id: I1fa00e359ef3583b9a7136bb888cdf5e1c3e75ac Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* | | | QDoc: Fix no-examples option.Martin Smith2012-04-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was accidentally removed in the big change regarding searching in the internal QDoc tree. Change-Id: I2496d7497d239f1ec5fbd01be6a918c1ef29fc95 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | | qdoc: Fixed to report read-only QML properties correctlyMartin Smith2012-04-117-179/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the default for a QML property is writable. If qdoc can't detect the actual read-only status, writable is assumed. There were some cases where qdoc could not determine the actual read-only/writable status for a QML property. In these cases, qdoc reported read-only because the default was read-only, which was not optimal. Change-Id: I55aeb2bedcde92a414f4d48a8d995e5e9dbca5da Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | | QChar: optimize some methods a bit for general caseKonstantin Ritt2012-04-112-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by reordering and regrouping conditions so that they lead to result earlier in most-common usecases (l.letters, spaces and puncts, u.letters, other); there are no title cased letters in range [0..127] -> use this in isTitleCase(); test for 0xa0 (nbsp) early in isSpace() as it is quite common in HTML, etc.; add early test to isNumber(). Change-Id: Ib415f34cb1212d9ccf8753de2d1beaece1aa2243 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Use windows API to update missing CA rootsShane Kearns2012-04-115-14/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows ships with a minimal set of CA roots. When using windows API to verify a certificate, it will fetch the root certificate from windows update (assuming it is part of the Microsoft trust program). As we are using openssl, this does not happen transparently. If SSL errors occur which indicate a broken chain then attempt to fix it using the windows API before emitting sslErrors. If the system CA certs are not in use (a CA bundle has been set on the socket or as the global configuration), then this is skipped. This is so an application can continue to use its own cert bundle rather than trusting the system certs. Key usage is specified, so that windows will return not trusted status if the root is not suitable for SSL (server auth or client auth OID). Testability: - to test, must delete the CA cert(s) from the "third party root certification authorities" section of the cert store using mmc.exe. - If the workaround of installing the windows XP cert bundle was performed, then you also need to delete certs from the "trusted root certification authorities" section. This is dangerous, be careful not to delete the required certificates which are documented on MS website - Naturally, modifying these areas of the cert store requires elevated privilege. Task-number: QTBUG-24827 Change-Id: I5cfe71c8a10595731f6bbbbabaaefa3313496654 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Modified project files to be iOS compatible.Qt4iOS2012-04-116-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some MacOS source code files from iOS build. Use unix standard paths for now (iOS-specific implementation will come later). Change-Id: I8b2731b431b3a379a1ec4ec07d227e886209e3e9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | Add support for QPlatformNativeInterface.Hannu Lyytinen2012-04-115-3/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial bits to enable figuring out the EGL display and context. Change-Id: I4b578e356dceb40b4456f0590d32c8df1f51fa53 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Use correct framebuffer object.Hannu Lyytinen2012-04-112-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KMS plugin deals with FBO IDs not equal to zero (the default FBO), so return the correct ID. Change-Id: I904fc0b8d732f856b4526bd7f73cc48c358c8441 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Release the EGL context after initialization.Hannu Lyytinen2012-04-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Threaded applications like qmlscene could not bind the EGL context if the context is already bound in the other thread. Change-Id: Ia75ef9e76ebff48aa2c9b348101ab2f388e18c5e Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Use the new plugin system in the KMS plugin.Hannu Lyytinen2012-04-113-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync up the KMS QPA plugin with the plugin system changes. Change-Id: Ifaa8be6f11aeb93acc63643c62ca15db4e9bc38f Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* | | | Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CMJason Barron2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The naming convention for these libraries says that libGLES_CM is to be used when EGL is included while libGLESv1_CM should be used when EGL is not included. Since we have a seperate variable for libEGL, it makes sense to have this variable represent the non-EGL version of the library. Change-Id: I9147c116da7be4a296a0ebeac39762b46725f10e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Remove Qt5 to-do comment in qtexthtmlparser.cpp.Jason McDonald2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment relates to a change that is neither source- nor binary-incompatible, so the change can be done in any minor release. Task-number: QTBUG-25117 Change-Id: Ifba3ef53241f9bf2504c573066e4cfa5fbfe679e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | eglfs: rework hooks designGirish Ramakrishnan2012-04-1110-59/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems with the current design: 1. if (hooks) hooks->foo() doesn't work in debug mode when no platform hook is defined. The problem doesn't arise in release mode because the compiler optimizes away the if (hooks) into a no-op since hooks is NULL when no platform hook is defined. 2. Adding a new hook requires changing every platform's hook implementation. New approach: 1. Define QEglFSHooks as a class with virtual functions. A stub file provides the default implementation. 2. Platform hooks derive from above class and reimplement whatever is needed. The filenames and variables have been changed to be more in line with the Qt style. Change-Id: I2eaaa5ad7c8b48a06361c4747d4f210c428c983f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Extend eglhooks to include hasCapabilityDonald Carr2012-04-116-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add BufferQueueingOpenGL to Raspberry PI's numerous capabilities Change-Id: I1197c28a0c82df3ae2f6d5360791010e17373555 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Add Mac OS X backend for QDesktopServices.Christoph Schleifenbaum2012-04-115-0/+138
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie48844ed93385c8aef9ae0765b7a3d26583ed642 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | | QHeaderView - remove some (nearly) unused span functionsThorbjørn Lund Martsum2012-04-112-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a couple of functions. Two of them are unused and the last one has its (now) very simple implementation inlined in the only caller. The last function was called something with spans and we would like to get away from using the word 'span' since we no longer uses spans. Change-Id: Icef95166289d52bd958400cba70daceb6fa75913 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | QHeaderView - rename many spans classes and variablesThorbjørn Lund Martsum2012-04-113-96/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In (SHA) b800d8b94a7861ecf8853621f6556fca186fb5b7 the span model was replaced with a plain section model. The code however still has variables and classes called someting with spans which would be confusing for possible new readers of the code. This patch cleans up most of it. It only renames classes,functions and variables (and not any semantics or the public API). Change-Id: I6ceb068c7317223f0d8e37f8032197f518d0174c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | | Fixed syncqt to ignore all lines that define Qt namespaceDenis Dzyubenko2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That includes non-standard macroses for QtAddOns, e.g. for QtJsonDb addon the macro looks like QT_BEGIN_NAMESPACE_JSONDB - by default syncqt doesn't recognize the macro and concantenates it with the next line in the header file, which breaks forward include generation if that next line is the class definition. Change-Id: Ia269f8a091113e4951d6a2615ef392b21bd5e3a3 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | Automatically query for Mac Proxy Server credentialsAron Rosenberg2012-04-112-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for automatically searching the Mac System Preferences for proxy server username/password. If a user has put credentials in the SystemPreferences->Network->Interface->Proxies area, we will now look in the KeyChain for those files. This will automatically pop up a Permissions dialog from the OS if valid credentials were found which match the server we are trying to access. Task-Number: QTBUG-22033 Change-Id: Ic7952afab4d16a65a87bb2f97a928c1c91167fe7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | | Add Proxy Auto Config support (PAC) on MacAron Rosenberg2012-04-112-5/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for fetching and parsing Proxy Auto Config files if one is specified in the Mac System Preferences Task-Number: QTBUG-2069 Task-Number: QTIFW-28 Change-Id: I91feb999222187e7467f2c41383904cf0cff8633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | | Minor clean up in QTextOption APIEskil Abrahamsen Blomfeldt2012-04-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source compatible, but binary incompatible, change to QTextOption API to make it consistent with Qt's coding style. Change-Id: I368f13925339fa41025a570f684f4b944844a022 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | | | Made qt_accStripAmp handle "&&"José Millán Soto2012-04-111-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed qt_accStripAmp implementation to handle texts which contains pairs of ampersands representing a single ampersand. In order to do that, a new static function called qt_accAmpIndex was created. This function is based on the code of qt_accHotKey, which was changed to use qt_accAmpIndex. Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit f864f8f79b88bbc3cc9007d2a92b08ca4b5cb871)
* | | | replace hardcoded values with a surrogate handling methodsKonstantin Ritt2012-04-112-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iba079953c46a29404232d2dacbe0c90170097d51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | minor improvement for NormalizationCorrectionsKonstantin Ritt2012-04-113-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | let's don't hardcode the latests affected version value and simply use the one parsed from NormalizationCorrections.txt Change-Id: I37021e8238d77deada4c5ba7a2d160c87186b9dd Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 03:35:18 +0000