summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mac: Don't crash if language preferences can't be retrieved.Eike Ziller2012-07-311-1/+1
| | | | | | | | | That can happen when e.g. running an application with sudo. Task-number: QTBUG-26547 Change-Id: Ib16ef7798ebcd1c9b8d661dd2e3ce3aadc393489 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Stabilize the QHeaderView test.Friedemann Kleint2012-07-311-1/+9
| | | | | | | | | | | | The test has a member QWidget *topLevel which it recreates and shows in init() without waiting for it to be exposed although it is not used in every test case. This apparently interferes with some tests that create separate top levels. Do not show in init(), delete the topLevel. Add wait to the cases where the topLevel is shown. Change-Id: Ib428020b36dc82991d41e68478fd583bdfb004c7 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Accessibility: fix updates for models with rootIndex set.Frederik Gladhorn2012-07-311-6/+12
| | | | | | | | | | | | | | | The accessible table/list implementation would ignore when a root index is set, resulting in trying to use row/column for the top level index, leading to accessing invalid indexes. (cherry picked from commit def2ee829435c705055733a0f99c0ca44a012c50) Conflicts: src/plugins/accessible/widgets/itemviews.cpp Change-Id: Ic2745ab3e262ccee2d43e0d532e165d2958f519e Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* build host tools in release mode againJoerg Bornemann2012-07-312-8/+2
| | | | | | | | CONFIG does not contain build_all anymore, thus we need to check QT_CONFIG in bootstrap.pr{i,o}. Change-Id: Ia505fa101adc49f185908ca575d3211caed612db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tst_qwidget task reference fixedJoerg Bornemann2012-07-311-1/+1
| | | | | Change-Id: I8d65f5912bfc2daa1e35be33a3c4d986508eebeb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-07-313-8/+42
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Change-Id: Ic27ede2d9531b94aff4c50c1699947ce72caf286 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove second argument from $$eval() (access to global scope)Oswald Buddenhagen2012-07-311-13/+2
| | | | | | | | | | | sam added this based on a vague notion of backwards compatibility when he fixed the function to use the local scope, but it kind of makes no sense - there is very little reason for accessing the global scope from within a function. google doesn't find any relevant hits except our source code, so let's just nuke it. Change-Id: Ie957bb47b531f7e9b5dfcceb4e09f65dd826b422 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't set -rpath-link in qmodule.priOswald Buddenhagen2012-07-311-4/+0
| | | | | | | qt.prf takes care of that already Change-Id: Ibc426583a007edbbe2f53cc21ce676eb60b33485 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* run processPrlFiles() over QMAKE_LIBS_PRIVATE as wellOswald Buddenhagen2012-07-312-2/+2
| | | | | | | | | | | | there is no reason why private libs should not have prls resolved. the two variables are resolved independently, so it's possible that (even more) libraries will appear duplicated on the linker command line, but that seems easiest for the time being. Change-Id: I9070ba53808a0661fa72949db8111106b7aca487 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* inline MakefileGenerator::processPrlVariable()Oswald Buddenhagen2012-07-312-19/+6
| | | | | | | | the visitor-pattern like approach is not needed any more Change-Id: I990db681cbeee91d89ecba97745a8104595247e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make the windows prl processing more like the unix variantOswald Buddenhagen2012-07-315-37/+14
| | | | | | | | it's more elegant, and more similar code is better. Change-Id: I2b8b036cb70a932fd171e23cf7d3389188401924 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove apparently useless codeOswald Buddenhagen2012-07-311-6/+1
| | | | | | | | | it wouldn't actually *do* anything, as l is not a reference. i cannot figure out the original intention, so let's just drop it. Change-Id: Ic0a3457a1872cde827259ee5530959120456e934 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* stub out MakefileGenerator::processPrlFiles()Oswald Buddenhagen2012-07-311-19/+1
| | | | | | | | | | the unix and windows variants don't rely on it. not making it purely virtual only because the project generator inherits MakefileGenerator as well but does not need an implementation. Change-Id: I80099b3f5d07cd037b408cf1099c58ff3a2904cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Search the include paths for json files containing plugin infoLars Knoll2012-07-314-8/+22
| | | | | | | | This fixes shadow builds with autogenerated .json files as e.g. used by Qt Creator. Change-Id: Ibb783b05d97d996100da4b0dca859fa3f310dc83 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Stabilize QWidget-test alienwidgets on XCB.Friedemann Kleint2012-07-311-1/+1
| | | | | | | Use QTRY_VERIFY for the mappped attribute check. Change-Id: I3cbde9122405bf7067f3702193e80636edc8c5c6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qclass_lib_map.h: Fix include of the QDeclarativeView widget.Friedemann Kleint2012-07-311-1/+1
| | | | | | | Task-number: QTBUG-25196 Change-Id: If25c4df29297435b159706257d9f37a9ef2f3d7a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Align the CP949 codec name with ICULars Knoll2012-07-312-6/+9
| | | | | | | | It's name is windows-949 according to ICU. Keep CP949 as an alias for compatibility with Qt 4. Change-Id: I115ba2593da6f7b47e25136c3fadb19c7f798ff0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixes to the qdom autotestLars Knoll2012-07-313-147/+14
| | | | | | | | | | Don't rely on a black list of codecs for the serialization test. This breaks badly when new codecs get added to Qt (e.g. through ICU). Instead use a white list of known codecs that can encode/decode the test data. Change-Id: I1dc55a25e852198bb935f070a4a21e8369f56268 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add missing namespace macrosLars Knoll2012-07-310-0/+0
| | | | | Change-Id: I7cfeece0914b03b6113207de96b931dc54377f77 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Small doc fixes about the list of supported codecs.Lars Knoll2012-07-311-3/+3
| | | | | Change-Id: I98b8ec9d5de9e69f1bb6187b4d820d61f7ce03e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Do not preload any codecs anymore when using ICULars Knoll2012-07-314-30/+81
| | | | | | | | | When using ICU we can now avoid pre loading any codecs at startup. Instead QTextCodecs will always be created lazily when first asked for. Change-Id: Ic668f2824700896d2eca7d0de54f978404826163 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add a factory method to QIsciiCodec and fix the namesLars Knoll2012-07-312-9/+21
| | | | | | | | | Make the names all lower case to be in line with what ICU reports. Add a factory method to create the codecs according to their name. Change-Id: Ia3dddaa7701a0645d9d8fbcb52f1f8d58f79cf98 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use ICU instead of iconv/windows codecs for the localeLars Knoll2012-07-314-35/+50
| | | | | | | | With ICU there's no need to use the windows locale or iconv codecs anymore as locale codecs. Change-Id: I50c94a97ed6acbf4c6f05b2a88593a57ebfa8342 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make codecForLocale atomicLars Knoll2012-07-312-37/+36
| | | | | Change-Id: I8017b1c2aa1df8d613e83919a945fd5f320713d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* ICU code page conversion supportLars Knoll2012-07-316-36/+804
| | | | | | | | | | | | | Use ICU to do code page conversion instead of the builtin text codecs. With this QTextCodec simply becomes a wrapper around ICU's ucnv_* methods. We only keep our own codecs for UTF-*, ISO-8859-1, ISO-8859-15 for performance reasons, and for TSCII and iscii-* because they aren't supported by ICU. Change-Id: I4fc49eba55cf772b9772c6dac606a47a44346a60 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Rename some codecs to be in line with ICULars Knoll2012-07-311-2/+2
| | | | | Change-Id: If523d2a12ef64c79e3860da1f430f128d24ff600 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Disable iconv on utf-8 based platformsLars Knoll2012-07-312-4/+5
| | | | | | | | | There's no need to use iconv on Mac, iOS, Android or QNX, as all these platforms are fully utf-8 based. Change-Id: I2a03c8dea72ad91f6ec83da0a838de20e46babef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Lazily initialize iconv in the iconv codecLars Knoll2012-07-312-4/+12
| | | | | | | | | | | | | | | Avoid dlopen'ing libiconv and initializing it's members until the codec gets used for the first time. This avoids some memory and startup time overhead in case we can use the utf8 codec instead of iconv. It also removes a circular dependency between codec initialization during app startup. Change-Id: I119c010c288dc59ab32279d8a213ae1f4347cace Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use utf-8 as the locale codec where it makes senseLars Knoll2012-07-311-6/+8
| | | | | | | | | Use utf8 as the fallback codec in case we can't determine something else instead of latin1. Also use utf8 for Mac, iOS, Android and QNX. Change-Id: I15dc85d2406b1ebdfacff25f45f8b6854c52b97e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove encoding detection according to LANGLars Knoll2012-07-311-142/+0
| | | | | | | | | This code is left over from the 90's, and should not get used anymore. In all relevant cases we will use UTF-8 or iconv nowadays. Change-Id: Ie3776f671de33f782fa77f6359bf6e105bd9c1b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move the text codec list to qcoreglobaldata.Lars Knoll2012-07-315-196/+116
| | | | | | | | | | | This removes some global statics in QTextCodec and makes the code better to maintain in the longer term. Remove QT_NO_THREAD defines around mutexes as this isn't required in Qt 5 anymore. Change-Id: I15ede75f53b16f134f4053f3188c4b47e86fcd8a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Ensure that QAtomicPointer of forward-declared classes worksThiago Macieira2012-07-301-0/+17
| | | | | | | | This is working, but let's just be sure by adding a testcase. Change-Id: I8c6b5ded0c7b6c90645dbf70a7ce6c1ba447a284 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* QtNetwork: Better detection of connection failures on WindowsMartin Petersson2012-07-301-21/+41
| | | | | | | | | | | | | | | If the error code from WSAConnect is WSAEWOULDBLOCK, then the operation proceeds but the outcome is not known at that time. We then check SO_ERROR's value to detect errors. But if that call returns 0 this could indicate that the value is still not know. In this case we try one more time to increase the chance of getting the correct value. This fixed the tst_QNetworkReply::getFromUnreachableIp auto test on Windows. Change-Id: I25008aca062b2f823e3d93ebb0ae456d7e4a6ecc Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QUrl: document that setIdnWhitelist isn't thread-safeMarc Mutz2012-07-301-0/+3
| | | | | | | This is a forward-port of 6b10fc91 from Qt 4. Change-Id: I58878bf24e4f1b50ebfd0457c37eef58696f4a4c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make benchmarks compile without QtWidgetsRohan McGovern2012-07-309-5/+27
| | | | | | | | | | | Ensure benchmarks which need QtWidgets are gracefully disabled when that module is unavailable. Fixed one unnecessary usage of "QT+=widgets". Change-Id: I8031b5dca585749f0f4d22e0637adc3f57f4e418 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* qdoc: Added safety checks to findUnambiguousTarget()Martin Smith2012-07-301-1/+4
| | | | | | | | | | This is a blind attempt to fix QTBUG-26615. I can't reproduce the crash on OSX. Task nr: QTBUG-26615 Change-Id: Ifc6b68b7f302b9cd7d02129be8ae56841a35e5de Reviewed-by: Martin Smith <martin.smith@nokia.com>
* fix QEventLoop qdoc errorsJeremy Katz2012-07-301-3/+6
| | | | | Change-Id: I17bb720d539a7ccf5d9a3b20853897ff052fc8a6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* tests: fixed check for QtOpenGLRohan McGovern2012-07-301-1/+1
| | | | | | | | | | contains(QT_CONFIG,opengl) tells whether Qt itself is able to use OpenGL, which is not the same thing as whether the QtOpenGL API is available. Make the check correct; fixes compilation when Qt is configured with -no-widgets (which also disables QtOpenGL). Change-Id: Iaa296c2b10650971ef4846f8bc6f44761fadcf7c Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* tests: disable qstandarditemmodel test when building without QtWidgetsRohan McGovern2012-07-301-1/+4
| | | | | | | This test uses QTreeView. Change-Id: I6ba56ad6ec3687a5b90d516be10d6f88e248d53d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* tests: removed QtWidgets dependency from tst_qsignalmapperRohan McGovern2012-07-302-16/+25
| | | | | | | | This test was using some QSpinBox instances to generate signals for testing. Use our own QtTestObject to generate the signals instead. Change-Id: I3714955ae040d541c3b613a478945c38a18be18d Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* QNX: Reduce dependency on QtWidgetsKevin Krammer2012-07-292-6/+2
| | | | | | | | Use QObject::inherits() to check if the current input focus object is a numerical input instead of trying to cast. Change-Id: Ie476fba3d2f9f20a1ce0328043430cb6a96a8a3d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Send the native scancode in evdevkeyboardLaszlo Agocs2012-07-282-4/+8
| | | | | | | | | | | | | | Until now the native scancode was not specified which meant when qwindow-compositor (or any other Qt-based compositor using the standard Wayland protocol, i.e. sendKeyPress() and such) tried to send the native scancode over to the clients, all it got was a code of 0. This fixes keyboard input when running qwindow-compositor on top of kms and EvdevKeyboard. Change-Id: I5d9a882f249634fb7584900b5f298f794befee3b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Document QEvent::EnterEditFocus and QEvent::LeaveEditFocus properly.Mitch Curtis2012-07-281-2/+2
| | | | | | | | These enums are only accessible if QT_KEYPAD_NAVIGATION is defined. Task-number: QTBUG-15631 Change-Id: Ifa826ac8f2bf28225572e0c664f18ffa5e78c302 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* removed duplicated docs in android qsharedmemory and systemsemaphoreJeremy Katz2012-07-282-27/+0
| | | | | | | | | | | | | Qdoc sees all source and header files, rather than the subset selected by qmake. This leads to qdoc errors when the same functions are documented in multiple implementations. In the cases fixed here, all documentation was duplicated, so no information was lost. Change-Id: Id7f8e2e617862a3778d0b05b38d8811aad456ac5 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Specialize QTypeInfo for QUrlTwoFlags to mark it PRIMITIVE.Stephen Kelly2012-07-281-0/+3
| | | | | | | | QTypeInfoMerger combines the typeinfos for the (PRIMITIVE) flag arguments. Change-Id: I5abf00489491d099f2bf7ba25c191a771a383d78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Mark the QFlag and QIncompatibleFlag as primitive.Stephen Kelly2012-07-281-0/+3
| | | | | | Change-Id: I7dab4d029e7840fe4778a750a8dd7367675d7a27 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* do not look for frameworks in library pathOswald Buddenhagen2012-07-281-3/+2
| | | | | | | it's just wrong Change-Id: Ia21e9fb7e67623d6c4f70eab1f76360624ba314b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* insert explicit library search paths before system search pathsOswald Buddenhagen2012-07-281-4/+6
| | | | | | | | ... as the linker does. Change-Id: I4a030d9e2f281b892b78ba25b11f6df6b0893712 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* look into /Library/Frameworks as well in processPrlFiles()Oswald Buddenhagen2012-07-281-0/+1
| | | | | | Change-Id: I445b9d1d3cd349eb7981b1aec824e6878b0c16e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* unify default search paths between findLibraries() & processPrlFiles()Oswald Buddenhagen2012-07-281-0/+2
| | | | | | | | i see no reason why they should deviate Change-Id: Iaa0445b79a95d348f51df74a74c7c89216c468ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 17:39:38 +0000