summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* change \img to \image in docsJeremy Katz2012-08-0131-54/+54
| | | | | | | | \img was a macro defined in macros.qdocconf. This collection of macros is being phased out. Use the full command instead. Change-Id: Ia55212f87bb46349d61359d40568e0aa33882596 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* replace \key and \gui qdoc commands with \uicontrolJeremy Katz2012-08-0155-359/+359
| | | | | Change-Id: I0753305d4fe1ea20417f451766101da1247dfeeb Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Removed useless qdoc warningsMartin Smith2012-08-011-4/+0
| | | | | | | | | | | qdoc was printing warning messages when a QML type was not given a minor version number in its \inqmlmodule command. The minor version number is not used for anything, so the warning messages are no longer printed. Change-Id: I5586b4d860fcc8e392de3d388c3327ed0029e266 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* OpenGL: Fix typo in extension nameSean Harmer2012-08-011-1/+1
| | | | | | Change-Id: Ibb65b832290085bd565388982594eb889e950aaa Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-01719-3/+721
| | | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I8129c3ef3cb58541c95a32d083850d9e7f768927 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix crash in uicAndreas Holzammer2012-08-011-2/+6
| | | | | | | | | | | Compiling Qt5 uic with Microsoft Visual Studio 2008 with SP1 will lead into a assertion in the copy constructor of qstring. This is apparently a compiler Bug. Change-Id: Ia3353434d00b2e87800b937d891eabef86293751 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Added default argument for color profile to QImage constructors.Alexandros Dermenakis2012-08-012-12/+20
| | | | | | | | | Added default argument for color profile to QImage constructor initializing QImages from pixel maps. This is to be used in future Qt versions where color profile support will be added. Change-Id: I815c3db4ef52f8383b48dad844b5f188aa3a3eee Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Skip doc subfolders when checking includes.Lars Knoll2012-08-011-1/+2
| | | | | | | | | This removes the bogus warnings when running syncqt from configure about snippets in the doc/ folders. Change-Id: I8e3d258238c1cd1e763ce63b895d58b68bbc06f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QNX: Do not send geometry change events to Qt too earlySean Harmer2012-08-012-22/+31
| | | | | | | | | | | We explicitly do not send geometry change events to Qt from QQnxWindow from the constructor. This prevents us from ending up in resizeEvent() reimplementations from the QWindow ctor. Change-Id: I045b35aa7eb23890772fe131c3d19314252f6a5a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Ensure that the QQnxWindow has a valid size for EGL surfacesSean Harmer2012-08-011-0/+4
| | | | | | | | | | | | | | | | If QWindow::create() gets called before resize() or setGeometry() then the rect argument passed into QQnxWindow::setGeometry() by the ctor is null. This could potentially result in 0 sized buffers and EGL surface creation being attempted. We bail out in this case and tell user how to fix their application. Change-Id: Ia709dba617fa266bd66b61409bdb1c980acfb1a2 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QNX: Remove dependency on QtWidgets from QNX QPA pluginSean Harmer2012-08-015-304/+4
| | | | | | | | Change-Id: I52027752630beee81a97644983dbccf973c0c2c2 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* statemachine: Make states exit order spec-compliantKent Hansen2012-08-012-9/+18
| | | | | | | | | | The SCXML spec states that entry order should be equivalent to "document order" and exit order should be "reverse document order". Since QStateMachine uses child order for the entry order, the exit order should be reverse child order. Change-Id: Ia7b05fdd5c9261ccf202f64f8d23f5c88b20a8c3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Remove usage of deprecated qWaitForWindowShown(QWidget *) method.Friedemann Kleint2012-08-0135-233/+219
| | | | | Change-Id: I445d24a09dbb7abb62a37bd9914284f21a4f08f1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make sure that the parsing mode reaches QUrlPrivate::setHostThiago Macieira2012-08-013-12/+37
| | | | | | | | | | | | Ensure that the parsing mode is cascaded down from setAuthority and setUrl so that the hostname parsing does not attempt to decode percent-encoded hostnames when it shouldn't. Take the opportunity to also remove the "Boolean Trap" from QUrlPrivate::setHost. Change-Id: Ia64754c4a4900182700b7af1382aea8410abc7e9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make QUrl::setScheme only parse in strict mode (no decoding)Thiago Macieira2012-08-013-19/+14
| | | | | | | | | | The URI RFC defines schemes as containing only a very restricted set of characters, none of which require encoding, so don't even try. Testing this behaviour in some web browsers indicate that they do not accept percent-encoded schemes either. Change-Id: I692dd20e1aac7e8a1bcb276cb5113b5802393d38 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QUrl support for empty usernames and passwordsThiago Macieira2012-08-012-4/+10
| | | | | | | | | | | | | | | If the password is empty (but present), the userinfo component of the URL should end in a colon (":"). QUrl already supported that and it was tested (case "password-empty"). If the username is *also* empty but present, the userinfo component is just the colon (":"). Fix support for that case by checking if we stored the presence flag instead of checking the size of the component. Change-Id: Ie224493a997dbf76b2e44dd6d55fd9674ac83c1c Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix handling of encoded NULs (%00) in QUrl::fromPercentEncodingThiago Macieira2012-08-012-2/+5
| | | | | | | | | | | | | QString::fromUtf8, without an explicit size, (currently) defaults to stopping at the first NUL. That means we need to pass an explicit size. Also take the opportunity to test that QUrl::toPercentEncoding also works with the same data. Change-Id: I79362d67afda624b01ca07b0315b611c4aa3fdda Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* Remove references to Borland and bmakeAndy Shaw2012-08-0114-380/+49
| | | | | | | | | Remove references to an old compiler that has not been supported for a long time. Also remove Borland specific configuration flags which have no meaning elsewhere. Change-Id: I3634a52b78f737ea972073e14c2b6669dcd0ae63 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't change a widget's active state in QWindowsWindow::setWindowStateJoerg Bornemann2012-08-012-35/+18
| | | | | | | | | | | | | QWindow::setWindowState is not supposed to set the window active. The method requestActivateWindow() should be used for that. When switching from and to fullscreen mode we're always passing SWP_NOACTIVATE to SetWindowPos to not change the activation state of the window. This is inverse to the old behaviour, which did not have an effect. Change-Id: I339337935cdad76b3ef252202e92177f37543038 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Doc: QVarLengthArray::length is new in 5.0Christian Kamm2012-08-011-0/+1
| | | | | Change-Id: I796e67d677309460d79a7a64a6890dfbcfbace69 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adding configure option: -no-gcc-sysrootThomas Senyk2012-08-012-5/+15
| | | | | | | | | | | | | | | | | | This option is important if you want to use configure's and qmake's -sysroot (e.g. PKG_CONFIG settings, device-files), but the toolchain (in combination with the rootfs) is not able to handle gcc's --sysroot. One known case is freescale's ltib setup where the toolchain itself comes with all the essential files (e.g. crt1.o), while the rootfs has none of those files, so gcc's --sysroot can't be used. The rootfs on the other hand contains all kinds of "less important" files/packages (e.g. libdbus). For those "less important" files/packages Qt needs pkg-config to be able to include/link properly. Therefore one needs configures -sysroot without gcc's --sysroot. Change-Id: Iaec9b07012f2945f3ecb3ced0ed95176721b5ecd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a .prf file for SIMD qmake variables.Michael Goddard2012-08-012-140/+275
| | | | | | | | | | | | So you can get AVX/NEON etc source compiled by assigning to the corresponding variable (e.g. AVX_SOURCES). This was previously used in just the gui module, but other external modules might like it too. Change-Id: I51aa64760c469c7dc4c71e6f089c2ddef4f509c5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use QtCore instead of QtGui for the standardpaths comments to be correctLaszlo Papp2012-08-017-7/+7
| | | | | | | Change-Id: I98004fed565ac9653947ec70a3197b0372abcf2b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* Lazy initialize library pathsHarald Fernengel2012-08-011-7/+4
| | | | | | | | | | For a lot of command line tools, library loading is not required, so don't waste a lot of time computing them. According to callgrind, this makes the QCoreApplication constructor factor 6 faster, and also removes a lot of stat() calls and other file system access. Change-Id: I0211f5303712fa0dcfc4168cce7025283c63c9d1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Avoid qobject_castKent Hansen2012-08-011-1/+2
| | | | | | | | | | | | This is slightly faster, and also avoids accessing the object's meta object that would cause any lazily created meta objects (e.g., for QML) from being built. This is just a port of commit a5972f8ec32631e70578c64e9d6c063b3c47f0f5 (which fixed QGuiApplication, but not QApplication). Change-Id: I0d5080495aa4fd4486db297968c4d06bbfacf89b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add command line options to windowgeometry testAndreas Holzammer2012-08-011-2/+17
| | | | | | | | | | Add -widgetminimized, -widgetmaximized, -widgetfullscreen, -windowminimized, -windowmaximized, -windowfullscreen as command line option to test creation of windows in these modes Change-Id: If192c131c8996d3b67648427e5784da47ffee971 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix compilation: Move qHash(const T &t, uint seed) up.Friedemann Kleint2012-08-011-2/+2
| | | | | | | | | It needs to be visible from qHash(const QPair<T1, T2> &key, uint seed). Change-Id: Ibb63ce6da1e655bfb841c5e580e184ef66c5b766 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix reloading of pluginsLars Knoll2012-08-012-0/+25
| | | | | | | | | Unloading and reloading a plugin didn't work correctly, because we didn't reset instance to 0 on unload. Task-number: QTBUG-26098 Change-Id: Ic3e4497f359b1ca455be949dce9cafa9d67d8039 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix some syncqt warnings.Lars Knoll2012-08-015-1/+23
| | | | | Change-Id: I6f432ee991f4bde217fa27d4004ef318f1d480e0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix showFullScreen for QWindowAndreas Holzammer2012-07-311-1/+2
| | | | | | | | | | | | | If the setWindowState is called in a early stage, where the window is not yet shown, the fullscreen flag is cached in the QWindow. Then in the call to setVisible(true) the window gets generated, but the fullscreen is not handled there. So set the state while window is generated. Change-Id: I0ea53ed8a2465da6a9973d84fb4579381543e89b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix QWidget::activateWindow for child widgetsJoerg Bornemann2012-07-311-2/+4
| | | | | | | For child widgets we must use the windowHandle of the toplevel widget. Change-Id: If7bad8ed4bba694806a2c8b77bae3d25cc200b8b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix window activation in tst_qmdiArea::subWindowActivated2Joerg Bornemann2012-07-311-1/+1
| | | | | | | | | | | | | QApplication::setActiveWindow doesn't activate the native window but marks the widget as active inside Qt. We need to use QWidget::activateWindow instead. See docs. Also moved the activation call further down because on Windows a minimized window cannot be activated using the activation-by-focus fake we're currently using. Change-Id: I752f6ada1f463931fa9cfb3c35f42dbec0207bfa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Implement synchronous WS events by flushing.Friedemann Kleint2012-07-314-17/+26
| | | | | | | | | | | | | | | | | | | | | | | Previously synchronous window system events were implemented by bypassing the queue and processing the event immediately. This is not ideal since the event order is not preserved - there might be "happened before" events waiting in the queue. Add QWindowSystemInterface::flushWindowSystemEvents and change all handleSynchronous* to 1) queue the event 2) call flushWindowSystemEvents. flushWindowSystemEvents is almost identical to the already existing sendWindowSystemEvents with the exception that it does not call QApp::sendPostedEvents. Move the common implementation to a new private function. Task-number: QTBUG-20778 Change-Id: Ie98a83875bc0a14e335e36bed0dd9e0ed4a1dea0 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Adding missing QT_BEGIN_HEADER/QT_END_HEADERSergio Ahumada2012-07-311-1/+5
| | | | | Change-Id: I1144497ec8376ec41c714b7a55c05637b6feee66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* 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>