summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* qdoc: Add CLI option to not generate example docs.Casper van Donderen2012-03-284-10/+19
| | | | | Change-Id: I059ae76430adada020d338905b39ba3089c89615 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* qdoc: Rename QML classes to QML types in ditamap.Casper van Donderen2012-03-281-1/+1
| | | | | Change-Id: I7b1a10d0d25a0a79fb018ab9138f2ef32470475d Reviewed-by: Martin Smith <martin.smith@nokia.com>
* qdoc: Do not write index.dita multiple times in ditamap.Casper van Donderen2012-03-281-0/+9
| | | | | Change-Id: I69719237d0ab567ce2a606c96b38f6baa2a601b5 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* qdoc: Implement \uicontrol command.Casper van Donderen2012-03-287-1/+25
| | | | | Change-Id: I10381cd69d32352c590ec5a7d4041465af57b88b Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Remove comment about QVariantList and QVariantMap.Stephen Kelly2012-03-281-2/+0
| | | | | | | | | | They predate Qt 4.5, but it looks like the comments are indicating that QVariantList and QVariantMap types will use the basic template, but that is not the case. Instead they will use the compare specializations for QList<T> and QMap<T> respectively. Change-Id: Iebf7e9b8aaa8a699ea720090fbf641dfecde0ff7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make QCoreApplication::applicationName() default to argv[0]David Faure2012-03-284-21/+36
| | | | | | | | | | | | This makes it more useful in all the Qt apps that don't set it, given that it's used internally by QTemporaryFile, QTemporaryDir, QStandardPaths, QDBus, QAccessibleApplication, etc. Qt4 compatibility in the deprecated QDesktopServices is preserved, no fallback there. Change-Id: I584463507cf917a3720793c6bd45d07c60f8356c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't use the pri depends line for link dependencies.Stephen Kelly2012-03-284-8/+8
| | | | | | | | | That is not what depends is for. Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Prefix the variables for debug and release types properly.Stephen Kelly2012-03-283-8/+8
| | | | | Change-Id: I346992effa997f60a4fd20055f0af81d6a084095 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Only create the cmake files if DESTDIR is non-empty.Stephen Kelly2012-03-281-1/+1
| | | | | | | This is the case for the winmain library. Change-Id: I8f416e81ad8de4a1fb2f70a4ebc31c8351c81605 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove Qt5 TODO to change QListView semantics.Stephen Kelly2012-03-281-2/+0
| | | | | | | | | | | | | | The comment was written before Qt5 was planned, so it might have seemed like a good idea to change the semantic with Qt 5.0. However, as Qt5 is intended to be close to Qt4 in behaviour, this isn't really a 5.0 change. It can be done any time, but only optionally and while retaining backwards compatibility. Change-Id: I8c5c497d13a7ec6574e1cdb6bd411e8b28db876b Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Protect QAbstractTextDocumentLayout::anchorAt() from preeditPekka Vuorela2012-03-272-0/+47
| | | | | | | | | | Previously the method didn't take into account that hitTest() returns visual index, i.e. containing the preedit, and thus was easily hitting assertion. Need to compensate for that before checking for actual link. Change-Id: I119e7f91088b4db9d347a3da338f6df915ce9719 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Stop erasing mkspecs/modules at every reconfigure.Thiago Macieira2012-03-271-1/+10
| | | | | | | | | Developers who are building & rebuilding Qt often end up needing to recompile all other modules because of this removal even though the libs are still compatible. Change-Id: I4ec0e8ab222675dcd2a3f3a2b5e931c1c7f31f69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable EGL (and thus EGLFS) if we're not using OpenGL ESThiago Macieira2012-03-271-1/+8
| | | | | | | | | | | | | | EGL support in src/platformsupport/eglconvenience requires OpenGL ES to be enabled, so it makes no sense to test for the presence of EGL if we're not enabling OpenGL ES. EGLFS has similar requirements, so ensure it gets disabled too. Otherwise we're going to get lots of undefined symbols in the EGLFS plugin to things in QtPlatformSupport that did not get compiled in either. Change-Id: Ie55dd2e2597ec0594aa589ee8aac150c71104b46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix scopes on iconv related pro/pri filesRafael Roquetto2012-03-272-2/+2
| | | | | | | | | Ensure corelib and the iconv configure test link against libiconv on QNX-based platforms. This now includes the Blackberry mkspecs which were previously excluded. Change-Id: I60677ab8506b7cf47f504b880bb1078036984e85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove xlib plugin.Robin Burchell2012-03-2727-6172/+0
| | | | | | | | | | | There's not much point having this with the xcb plugin being present, and xlib is pretty much unmaintained / broken anyway. Task-number: QTBUG-24913 Change-Id: I090a9a0e6d2f893c030574e23f1d59f610282bd3 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* XCB: Simplify xcb error handlingUli Schlachter2012-03-274-132/+41
| | | | | | | | | | | Instead of getting errors just to feed them to the default error handle, the corresponding unchecked request is used which automatically makes errors go to the default error handler. Change-Id: Ib213a860affb72de6f9896f68505e283a809d58f Signed-off-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add manual test for window modalityBradley T. Hughes2012-03-274-0/+468
| | | | | | | | | This test allows us to recreate any modal scenario. Multiple top-level windows with any depth of window and application modal dialogs is possible. Change-Id: Ieef2c557d2f9ad2d2b2d2b598e9415f4c1e2dcb5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update documentation for QAbstractEventDispatcher::TimerInfoBradley T. Hughes2012-03-271-4/+27
| | | | | | | | This type is not a typedef anymore, it's a proper class. Change-Id: I611df067f2983baf262d84a82fb98e61124956d2 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix compilation when QT_NO_PRINTDIALOG is defined.Qt4iOS2012-03-272-4/+4
| | | | | | | | Some code intended to be disabled when QT_NO_PRINTDIALOG is defined was being compiled due to misplaced #ifdef and/or #endif. Change-Id: Ic8587872fae03cac2895e54e34f8f20cb575d92b Reviewed-by: John Layt <jlayt@kde.org>
* QUuid: mark constructors constexprMarc Mutz2012-03-271-0/+16
| | | | | | | | | | | | | | | | | See e.g. f3141c58badbd2da9eb42 for rationale. The problematic part here is the array member which in C++98 cannot be initialised in the ctor-initializer-list. For this, C++11 Uniform Initialisation is needed, for which Qt does not yet have a Q_COMPILER_* macro. I'm not sure we need one, either, since I doubt that there's a compiler that implements std::initializer_list, but not uniform initialisation. Change-Id: I4fa8f4f9db8703096358634fb2e6f5de61f0fedd Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add QPA notes to QCursor pos() and setPos()Laszlo Agocs2012-03-272-1/+19
| | | | | Change-Id: I7173816e0d792d6d26497b4fd59a57a50e512afd Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QHttpNetworkConnection test: avoid integer divide by zero exception.Martin Petersson2012-03-271-1/+1
| | | | | | | The speed calculation caused a dived by zero exception. Change-Id: I83281c8e66b9c18e7d282920901ccac1e9444a68 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix keyboard navigation order for buttons with RTL layoutOrgad Shaneh2012-03-271-4/+12
| | | | | | | | | On RTL layout, right key should move to previous button, and left key should move to next button. Task-number: QTBUG-15790 Change-Id: If0753f9082b3a3624b95276840f5f3799b5e14bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Implement application font loading for WindowsMiikka Heikkinen2012-03-274-28/+177
| | | | | | | | | | | | | | | | | For FreeType Windows font database, use the application font loading implementation of the parent class. For native Windows font database, the implementation was adapted from Qt 4.8. Also fixed a bug in font database population, where old data was not destroyed before population, resulting in fonts not getting properly repopulated when a new font was added. Task-number: QTBUG-24193 Task-number: QTBUG-24195 Task-number: QTBUG-24196 Change-Id: Ie224a87baf7500b9867aaafa807f62dd4503dee8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove obsolete references to QWS from configure script.Jason McDonald2012-03-271-3/+3
| | | | | | Task-number: QTBUG-24027 Change-Id: Id7be20aa4438e590d629ec96f5ad817866f83764 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a Q_NORETURN macro to mark a function that never returnsThiago Macieira2012-03-271-0/+6
| | | | | | | | | This is implemented for GCC, ICC, Clang and MSVC. With this macro, the compiler can generate better code because it knows that the function being called will not return. Change-Id: Iea2bc7be464606639be65ccb73911d7ed1b29a64 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix some compiler warnings in tests.Friedemann Kleint2012-03-278-14/+20
| | | | | | | | - Unused variables - Deprecated conversion from const char * to char *. Change-Id: Iea0b9c4613ea74cead6d95ba12ad1028f531cbff Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Reverted use of tentative commit use in QWidget editorsPekka Vuorela2012-03-2714-112/+108
| | | | | | | | | Feature to be reimplemented simplified. Cases when input method needs to be reset with possibility to commit use QInputMethod::commit() again. Change-Id: Ibfe7aecc0799e7a76c7ac4f5d860971cfe6e97ca Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Introduce FontSmoothingGamma as a platform style hint.Friedemann Kleint2012-03-2714-66/+138
| | | | | | | | | | - Allocate gamma tables on the heap in a thread-safe way, use font smoothing returned by the style hints of the platform to calculate them. - Improve font rendering on Windows. Change-Id: I8cd39b51cf03cbd642474c02b9076814baecd597 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix IAccessible2 for Windows, enable MSAA/IAccessible for MinGW.Jan-Arve Saether2012-03-274-5/+116
| | | | | | | | | | | | | | | Commit 5e9089135bfe7db7d7a43c9ee4d4c24ab8f6458d had some problems: * It left out the cast to IServiceProvider in the refactoring of QueryInterface. This broke IAccessible2. * It also failed to enable the codepath for MinGW inside wrap(), which effectively caused MSAA for MinGW to be disabled. It also adds an autotest to the bridge (finally). It is simple, but it should help avoiding committing stuff that completely breaks the bridge. Change-Id: I459d89c3bdb93e54ddea85872b50fc1dba0fe4a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: silence warning about QCocoaWindow member initialization orderBradley T. Hughes2012-03-271-1/+1
| | | | | | | | | | qcocoawindow.mm:99:7: warning: field 'm_glContext' will be initialized after field 'm_inConstructor' [-Wreorder] , m_glContext(0) ^ Change-Id: I9e090ddeeaeea581b480b2e7b2b99360062c0632 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* QJsonParseError improvementsAlexei Rousskikh2012-03-273-18/+97
| | | | | | | | - added human-readable error message - improved enum value names Change-Id: I86d4bb419f9581f85d61b6e090048f1943017f9e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Configure QPA cleanupDonald Carr2012-03-271-1046/+373
| | | | | | | | | | | | | PLATFORM_QPA is always true PLATFORM_X11 is always false remove/collapse all related conditional statements to lend greater clarity to the configure script Change-Id: I4998edf5402019370333ed79effcd0cacafbe87d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove 'tests' as default build part.Marius Storm-Olsen2012-03-272-3/+12
| | | | | | | | | | | | | | | | | This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Uncomment disabled code in QSettings autotest.Jason McDonald2012-03-271-6/+3
| | | | | | | | | The code in question was already commented out before the test was added to the Qt repository in 2006. After changing the code to use QFile::rename() for portability, the test appears to pass. Change-Id: I52a8578a47da419cabf5826b633cc4f2ac2c5218 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Disable ICC diagnostic 2261 about __assume with side-effectsThiago Macieira2012-03-271-1/+1
| | | | | | | | | | | | The warning is presented now that we use __assume in every Q_ASSERT. It presents itself in code that calls functions, like: tools/qbitarray.h(128): warning #2261: __assume expression with side effects discarded { Q_ASSERT(i >= 0 && i < size()); ^ Change-Id: I5851b3c35b56c00b9c541c2489233121ef621e04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-275-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Mark tst_qdialog as insignificant on mac.Rohan McGovern2012-03-271-0/+1
| | | | | | | | | This autotest gives different results on consecutive runs, and is therefore insignificant for the purpose of detecting regressions. Task-number: QTBUG-24977 Change-Id: I5c4dfd663ce5df6b60ae47a29d332c06e3c0585f Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Sync configure with Unix version (-make/-nomake)Marius Storm-Olsen2012-03-272-9/+25
| | | | | | | Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Cocoa: initialize QCocoaEventDispacherPrivate::lastSerialBradley T. Hughes2012-03-261-0/+1
| | | | | | | | This silences warnings from valgrind about a conditional depending on an uninitialized value. Change-Id: I819a44ed5dc02e163c00849811870c94f66b6651 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove old code that was for the MIPSpro compilerThiago Macieira2012-03-261-14/+1
| | | | | | | That compiler is no longer supported Change-Id: I6ff9003a8b986478850ad2e6e6662a44264236d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix annoying deprecation warning about QImageTextKeyLangThiago Macieira2012-03-261-3/+18
| | | | | | | | | | | | | | | | | | | If we deprecate the entire class, then we get the warning for every use of it with GCC, including the three operators defined inside the class. So instead, mark as only the constructors as deprecated, which should reduce the warnings to the places where the class was instantiated. That should be enough to poison the code enough: to fix the warning, you need to stop using the class there and/or stop calling one of the deprecated functions that deal with it. Unfortunately, we still get one more warning inside the inline code, in QImage::textList. To remove that warning, we disable all deprecation warnings around that code block. Change-Id: If3c11647a9d2cab055e15810d7cfe0d8f5e7042f Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* let qtPrepareTool give right path for app_bundleBai Jing2012-03-261-0/+6
| | | | | Change-Id: Ieb4979244d741c9d9d0c11a035c18ced87ea28f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Blackberry mkspecsRafael Roquetto2012-03-264-0/+102
| | | | | | | | | | | | Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. Change-Id: Ia44e9b4059f720c308240e9dac7e90f7ae7920d0 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Cocoa: Remove unused qt_mac_is_sheet() functionBradley T. Hughes2012-03-261-11/+0
| | | | | | | | The static qt_mac_is_sheet() function in qcocoafiledialoghelper.mm was not called anywhere, remove it. Change-Id: I88785e15aa17ae9c9ffbc33eba30433c8834b798 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: silence warnings about unused variablesBradley T. Hughes2012-03-266-3/+6
| | | | | | | | Silence warnings about unused function parameters and local variables while building the Cocoa platform plugin. Change-Id: I6aedc4cb21c5fb48d2d6e501561473d3f7112aed Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: silence warnings from QCocoaBackingStoreBradley T. Hughes2012-03-261-16/+1
| | | | | | | | Remove unused (and misspelled) flipedRect() function, as well as several unused variables. Change-Id: I48a5bf2eaad67686f60523a5c22262cad5314128 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: QCocoaWindow::clearNSWindow() needs to cleanup properlyBradley T. Hughes2012-03-261-1/+3
| | | | | | | | | | | clearNSWindow() should also clear the delegate and remove the contentView from the window, since we are no longer using that window. Make sure the QCocoaWindow::~QCocoaWindow() doesn't release the m_contentView until after clearNSWindow(), to avoid crashes while trying to cleanup the window and view. Change-Id: Ia081488f629a4fd4cf10fb1053fb8183b1914d35 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Reunite NAS support in configure with QSoundDonald Carr2012-03-261-10/+0
| | | | | | | RIP Change-Id: I7c47052ce4962f10dbcbbb8d48f05b3158d4a69a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Cocoa: don't show window when calling raise()Bradley T. Hughes2012-03-262-5/+6
| | | | | | | | | | | Calling raise() on a hidden window should not show it. The setVisible() function will ensure that the window is raised (since we use orderFront or makeKeyAndOrderFront). This fixes the failing tst_QDockWidget::task169808_setFloating() test as well. Task-number: QTBUG-24774 Change-Id: If34472ebbcd615c10654efafd54c84c03d10bc8c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>