summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-1012-0/+81
| | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Respect capacity in QVector::append().Liang Qi2011-05-102-2/+82
| | | | | | | | | | | Fix a bug in QVector::append(), it should use the capacity for new size, when it is implicit shared and capacity is bigger than the new size. Autotest included. Task-number: QTBUG-11763 Reviewed-by: joao Reviewed-by: Olivier Goffart
* Skip test on MacOS due to problems with corewlan pluginShane Kearns2011-05-091-1/+5
| | | | Reviewed-by: Cristiano di Flora
* Fix QNetworkConfigurationManager usage outside main thread firstShane Kearns2011-05-093-3/+81
| | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfigurationManager creates the engines loaded from plugins as objects in the main thread. If a QNetworkConfigurationManager instance is created in a worker thread without any instance previously existing in the main thread, then it is uninitialised until the main thread has run. This causes allConfigurations() to return an empty list if called immediately after instantiation, for example. This fix initialises the plugins using blocking queued connections, which causes the worker thread to block until the initialisation function has been called in the context of the main thread. Deadlock is possible if the main thread is for some reason waiting on the worker thread, but it will not deadlock on QNetworkConfigurationManager's mutex. If this is a problem for an application, it should use QNetworkConfigurationManager from the main thread first to preload the plugins. Task-number: QTBUG-18795 Task-number: QTBUG-18799 Reviewed-by: Cristiano Di Flora
* Update QTBUG-17223 for Qt 4.8Shane Kearns2011-05-093-1/+16
| | | | | | | | | | | | | | | In Qt 4.7, http network requests are assigned to http connection channels before connecting the channel. In Qt 4.8, channels are connected "blind" as this gives a performance improvement in certain circumstances. On the assumption that User-Agent should be the same for all the requests being sent to the server in a given burst, we use the first queued request to set the user agent for a http proxy. Task-number: QTBUG-17223 Reviewed-by: Markus Goetz Reviewed-by: Martin Petersson
* fix tst_qnetworkreply::httpProxyCommands autotestShane Kearns2011-05-091-2/+7
| | | | | | | | | | | | | Due to architecture changes in Qt 4.8, clearing the proxy before the request is complete causes the http connection to not use any proxy. The issue is that the proxy isn't resolved until after the bearer has been started (which is correct in the general case, as system proxy is unknown until that time). Also increased the test's timeout from 1 second to 15, as starting a bearer can be slow. Reviewed-by: Markus Goetz
* Send User-Agent from the network request in http proxy CONNECT commandShane Kearns2011-05-095-2/+28
| | | | | | | | | | | | | Some proxies can discriminate based on the User-Agent when sent a CONNECT command for establishing a HTTPS connection. With this change, if the User-Agent header is set in the QNetworkRequest then it will be passed to the http socket engine for use in the connect command sent to the proxy. As before, "Mozilla/5.0" will be used by default when no user agent has been set. Task-number: QTBUG-17223 Reviewed-by: Markus Goetz
* Add autotests for configuration dependent network proxiesShane Kearns2011-05-092-1/+145
| | | | | | | | | 1. test that systemProxyForQuery returns something for all configs 2. test that QNetworkAccessManager uses the settings for the configuration it was started with. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* Fix QNetworkReplyImpl error handlingShane Kearns2011-05-091-4/+13
| | | | | | | | | The backend was never started when compiled without bearer management, now it is. Now emits the error signal in case of startup errors which would leave the state machine hanging. Previously it just printed a warning. Reviewed-by: Peter Hartmann
* Enable per network configuration proxy settings in QNetworkAccessManagerShane Kearns2011-05-092-27/+53
| | | | | | | | | | | | | | Delayed the resolving of the proxy until the backend is being started. This is because the proxy settings are not known until after QNetworkAccessManager has brought the network online using QNetworkSession. On Nokia's symbian3 phones, the default network configuration is a service network containing a list of access points in priority order. For a typical user, this will include one or more WLAN networks and a cellular network - each of which can have different proxy settings. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* Allow a network configuration to be included in a proxy queryShane Kearns2011-05-093-4/+123
| | | | | | | | | | | | | When Qt is compiled with bearer management support, the network configuration can be included as a parameter in QNetworkProxyQuery. This allows QNetworkProxyFactory::systemProxyForQuery to get the right proxy setting for a specific network. For example a mobile phone could have network configurations for home WLAN, work WLAN and 3G data access points, each with different proxy configurations. Task-number: QTBUG-18618 Reviewed-by: Peter Hartmann
* Fix error handling in write for socks socket engineShane Kearns2011-05-091-1/+6
| | | | | | | | When socks socket engine calls the write function of the native socket engine, it now propagates errors to the abstract socket. Task-number: QTBUG-18713 Reviewed-by: Markus Goetz
* Merge remote-tracking branch 'mainline/master' into earthOlivier Goffart2011-05-06191-7909/+2567
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-0613-6735/+15
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: uic: Remove Q3Support.
| | * uic: Remove Q3Support.Friedemann Kleint2011-05-0613-6735/+15
| | | | | | | | | | | | Remove code and tests.
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-061-1/+0
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Dont do doneCurrent in swapBuffers
| | * Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
| | |
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-061-2/+10
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Changelog: Qt Designer 4.8
| | * Changelog: Qt Designer 4.8Friedemann Kleint2011-05-051-2/+10
| | | | | | | | | | | | (cherry picked from commit 3a10cfc583f30be4dd98e1fcc3463c3d8bc14f31)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-061-2/+2
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: compile openvg with private headers
| | * compile openvg with private headersMarius Storm-Olsen2011-05-051-2/+2
| | |
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-051-1/+1
| |\| | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Remove misspelled comment in tst_qtextdocument.cpp
| | * Remove misspelled comment in tst_qtextdocument.cppEskil Abrahamsen Blomfeldt2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The comment was copy-pasted, spelling error and all, from the example in the bug report, and really doesn't make any sense at all in this context. Reviewed-by: TrustMe (cherry picked from commit 7ac511d8d906575dff1a02361e31251b244d3b3a)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-053-4/+7
| |\| | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Only enable design metrics for scalable fonts Add a way to retrieve CTFontRef from QFont
| | * Only enable design metrics for scalable fontsJiang Jiang2011-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | Bitmap fonts don't have linear advance at all. Reviewed-by: Eskil (cherry picked from commit 111accbf9aaf95b052448ecb70937c61e9b59d66)
| | * Add a way to retrieve CTFontRef from QFontJiang Jiang2011-05-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since macFontID restricts to quint32, we have to return that in QFont::handle. Task-number: QTBUG-17890 Reviewed-by: Eskil (cherry picked from commit c8f299b7e675c839b16d750cd2633a57cdd0526f)
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-05175-1165/+2533
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (46 commits) Add Q_UNIMPLEMENTED() macro Fix build error on Mac Build fix BC cleanup in uitools. Fix framework absolute path issue Remove QFontEngineFT::loadGlyphMetrics Add required font metrics functions to QRawFont Include pixel size of font in exported HTML from QTextDocument Make it possible for animation driver to specify the advance time delta Compile on Windows Remove warnings Fix Wayland plugin so it works with the wayland bind api wayland: Track wayland changes Support GL ES 2 with uikit. Lighthouse: Fix virtual desktopwidget Support gamma correction of text on GL Added .tag file with Git revision. new configure.exe binary qmake nmake generator: pass MAKEFLAGS to sub-make calls Move private headers into versioned subdirectory ...
| | * Add Q_UNIMPLEMENTED() macroKent Hansen2011-05-041-0/+4
| | | | | | | | | | | | (cherry picked from commit adce00979c30cc22d26ba43c15e0c7a3733b57ab)
| | * Fix build error on MacPrasanth Ullattil2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | To use the private headers, the .pro file should contain QT += <module>-private Reviewed-by: Olivier Goffart
| | * Build fixPaul Olav Tvete2011-05-041-0/+1
| | |
| | * BC cleanup in uitools.Friedemann Kleint2011-05-047-185/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove virtual functions obsoleted by new resource handling in Qt Designer 4.4. Remove static hash of private objects for formbuilder. Requires fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools. Rubber-stamped-by: axis
| | * Fix framework absolute path issueJiang Jiang2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | module.prf incorrectly overwrites INSTALLS which results the absolute soname not prepended. Reviewed-by: Marius Storm-Olsen
| | * Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-042-101/+0
| | | | | | | | | | | | | | | | | | | | | It is no longer used and was accidentally merged back in. Reviewed-by: Eskil (cherry picked from commit 782535ac548c582542bd1c17207e288e816870a8)
| | * Add required font metrics functions to QRawFontJiang Jiang2011-05-042-0/+56
| | | | | | | | | | | | | | | Reviewed-by: Eskil (cherry picked from commit 2c8df8bfb679885c3cbd2ee02f5e4053fdd554c2)
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-042-0/+34
| | |\
| | | * Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-042-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you copy-pasted rich text in which the font size had been set using setPixelSize() the font size would be mysteriously forgotten. The pixel size property in QTextCharFormat was added ad hoc, and not integrated in the HTML exporter. Task-number: QT-4792 Reviewed-by: Gunnar (cherry picked from commit 5aa5c2e2935c1829cc6965198968699f17c24ec0)
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-0463-123/+275
| | |\|
| | | * Added .tag file with Git revision.axis2011-05-032-0/+2
| | | |
| | | * new configure.exe binaryJoerg Bornemann2011-05-031-0/+0
| | | |
| | | * qmake nmake generator: pass MAKEFLAGS to sub-make callsJoerg Bornemann2011-05-034-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | Unlike other make tools nmake doesn't do this automatically. Reviewed-by: ossi
| | | * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0244-95/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| | | * Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-022-2/+12
| | | |
| | | * Moved QtUiTools to CONFIGPrasanth Ullattil2011-05-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | QtUiTools is a staic library now. If this is added to QT variable qmake will treat this as a framework on Mac. This patch is to avoid that.
| | | * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-0211-5/+48
| | | | | | | | | | | | | | | | Output warning if not present
| | | * Make sure we don't always pull in modules from installed mkspecsMarius Storm-Olsen2011-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Qt, qmake should not pull in mkspecs from an installed version, as this will lead to incorrect paths for the current build. So, here we ensure only to pull in modules from there we detected the qconfig.pri, and ensure we still handle the QMAKEPATH case used by some.
| | | * QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startPolling() is called by each engine, so before it would start multiple singleshot timers. So I moved the timer to the class and check if it has already been started before it is activated again. So that we just use one timer. Task-number: QTBUG-17219 Reviewed-by: Iiro Kause Reviewed-by: Kranthi Kuntala (cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
| | | * QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann (cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
| | | * Fix compile warning on WindowsMartin Petersson2011-05-021-0/+1
| | |/ | |/| | | | | | | | | | Reviewed-by: Prasanth Ullattil (cherry picked from commit 800ad68e4f000e65b0a83ef1da2a29d595964156)
| | * Merge branch 'qtquick2'Gunnar Sletta2011-05-04104-755/+2078
| |/|
| | * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Gunnar Sletta2011-05-0431-160/+240
| | |\ | | | | | | | | | | | | qtquick2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 02:25:09 +0000