summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-01229-38792/+23899
|\ | | | | | | | | | | | | | | Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
| * doc: Correct error in QProxyStyle() doc.Martin Smith2015-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | Constructing the QProxyStle object with a null QStyle pointer causes the QProxyStyle to use the default native style. Change-Id: If624ed7a805aef839ca8a51242d12b2f6d777e83 Task-number: QTBUG-42231 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Make Creator happy with qobjectdefs_impl.h parsingThiago Macieira2015-03-311-0/+1
| | | | | | | | | | | | | | This is just so the Q_COMPILER_xxx macros get defined properly. Change-Id: Iee8cbc07c4434ce9b560ffff13d066aa0a8671cc Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Use QStringLiteral where applicable in QtDBusThiago Macieira2015-03-318-61/+64
| | | | | | | | | | | | | | | | | | Move to qdbusutil_p.h the string constants that are used often and in multiple places; use QStringLiteral in qdbusintegrator.cpp for the strings that are used often. Change-Id: I8e1325b9ba015bda91bf01c42175d8032ea32f62 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Windows: Fix QT_NO_OPENGL buildKai Koehne2015-03-312-7/+15
| | | | | | | | | | Change-Id: Ieb99dce5389c37fb28a28691c75bf879740398e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * xcb: set WM_NAME window propertyShawn Rutledge2015-03-313-0/+51
| | | | | | | | | | | | | | | | | | | | Some older window managers and utilities still ignore _NET_WM_NAME. Task-number: QTBUG-42209 Change-Id: Iff93c8188a0a73b04cdf361add153cd818ac670f Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Martin Gräßlin <mgraesslin@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * D-Bus system tray: emit activated on middle and right clickShawn Rutledge2015-03-313-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ActivationReason provides the type of click. If the icon has a D-Bus menu, then QStatusNotifierItemAdaptor::ContextMenu will not be called: the tray is responsible for opening the context menu. But an application can alternatively do something different with a right-click by not providing a menu, and instead handling the QSystemTrayIcon::activated signal with the Context reason. Simplified the code by emitting the signal directly in QStatusNotifierItemAdaptor. Task-number: QTBUG-44929 Change-Id: Ia062a9a2fd99554418d58a1ff6ecd4e862035198 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * D-Bus system tray: emit QPlatformSystemTrayIcon::activated on clickShawn Rutledge2015-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | This was incomplete functionality in 38abd653774aa0b3c5cdfd9a8b78619605230726 Task-number: QTBUG-44929 Change-Id: I7120a3de011c5df57ef5a9fbdfe056eee42d572b Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Fix running of dbus-send on some systemsThiago Macieira2015-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was printing the following error: arguments to dbus_validate_bus_name() were incorrect, assertion "name != NULL" failed in file dbus-syntax.c line 248. This is normally a bug in some application using the D-Bus library. Change-Id: Iee8cbc07c4434ce9b560ffff13d0586189ba3a79 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * D-Bus tray icon menus: support submenusShawn Rutledge2015-03-305-26/+36
| | | | | | | | | | | | | | | | | | In this case GetLayout will be called with the D-Bus menu ID of the menu item which contains the submenu. Task-number: QTBUG-45191 Change-Id: Ia8108272910eac10f040db5865ec4e070da80edb Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * Use Q_NULLPTR for the null pointers used in macrosThiago Macieira2015-03-302-4/+4
| | | | | | | | | | | | | | | | | | User code should build with -Werror=zero-as-null-pointer-constant Task-number: QTBUG-45291 Change-Id: Iee8cbc07c4434ce9b560ffff13d0031979b4c2fe Reviewed-by: Matthew Woehlke <mw_triad@users.sourceforge.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Add tests for detach on setDevicePixelRatio()Morten Johan Sørvig2015-03-240-0/+0
| | | | | | | | | | | | Change-Id: I414ff0b794e0202a7f8c931b59b973cb1e7dc148 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Fix incorrect FBO bindings with QOpenGLWidgetLaszlo Agocs2015-03-304-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLContext::defaultFramebufferObject() knows nothing about QOpenGLWidget and QQuickWidget. The problem is that this function (and others that rely on it) is expected to give the widget's backing FBO in paintGL() and friends. To overcome this, we have to provide a way for such widgets that indicate what is the expected "default fbo". Task-number: QTBUG-43269 Change-Id: I43f439f8609382b9f7004707ab0ef9f091952b4f Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * Fix invalid characters count in QBig5hkscsCodec::convertFromUnicode()Maks Naumov2015-03-301-0/+1
| | | | | | | | | | | | | | Change-Id: I3b06361f93e7ab6a3336b2c432e0a163a34ccb43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * QTabBar: Disable wheel events on MacGabriel de Dietrich2015-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | Many people complain about this unexpected behavior. We may consider introducing a style hint later for those few people that may want it. Change-Id: Ifab663b4b5c3a78a3544ab4408cf34f672df8c05 Task-number: QTBUG-8428 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
| * QCocoaMenu: Queue 'activated' signal emissionGabriel de Dietrich2015-03-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows catching exceptions without quitting the application. The behavior change should be unnoticeable since we can't activate the menu item from within the Qt application. Tested that the keyboard modifiers are still set when we get to the action signal handler. Change-Id: I43d0c377834450344bd3a3678e07b6631ba0b768 Task-number: QTBUG-15197 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
| * testlib: Don't limit linking to XCTest to Xcode projectsTor Arne Vestbø2015-03-301-1/+1
| | | | | | | | | | | | | | | | Applications built using the regular makefile generator also need to link to XCTest, as the library is referenced from qxctestlogger.mm Change-Id: Iedbb5c6a2811fd904d75abc20f4e39440e44e748 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Android: Only take ownership of threads we explicitly attach to.Christian Strømme2015-03-301-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we would take ownership of all threads when attempting to attach it to the VM, regardless if it was already attached or not, to avoid expensive re-attachments in our own code. The downside of this approach is that we might hijack threads the user wants to control themselves, and the later detach the thread while it still in use, e.g., after the QApplication instance is destroyed. This change does not add any infrastructure to enable more advanced management of attached threads, so threads might still be hijacked if the user make a call directly or indirectly through the QJNI API's on a thread that's not attached. Task-number: QTBUG-45110 Change-Id: I30f7faa2d8c2c35151e2ac8875ebf839bcd6c7c6 Reviewed-by: Sergey Galin <s.galin@2gis.ru> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Fix qdoc warning in qopengltexture.cpp.Friedemann Kleint2015-03-301-1/+1
| | | | | | | | | | | | | | qtbase/src/gui/opengl/qopengltexture.cpp:3652: warning: Cannot find 'ComparisonFunction' specified with '\enum' in any header file Change-Id: I92e808310f2d775cda30c1f1b6aaf0ed739b02f1 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Remove compression of posted input method events.Friedemann Kleint2015-03-301-4/+1
| | | | | | | | | | | | | | | | Input method events contain attributes, etc. and cannot be compressed. Change-Id: Ib9a2a80f1efec53f9d843684f8227e1f2e245853 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * Windows: Remove duplicated color masks in qt_write/write_dibv5.Friedemann Kleint2015-03-301-9/+0
| | | | | | | | | | | | | | | | | | They are apparently a relic of some old bitmap header that did not contain them (superseded by BITMAPV5HEADER). Task-number: QTBUG-45265 Change-Id: I993dda7d409f7963c9fabd42b0fac5f5586c6248 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * Use QDebugStateSaver to restore space setting in stream operators.Friedemann Kleint2015-03-3026-31/+62
| | | | | | | | | | | | | | | | Returning dbg.space() breaks formatting on streams that already have nospace() set. Change-Id: I55e38b018679a67eb40be6b4664505483a3a7d8e Reviewed-by: David Faure <david.faure@kdab.com>
| * Use Xlib to resolve font cursor if possibleJørgen Lind2015-03-301-0/+12
| | | | | | | | | | | | | | | | before fallingback to uploading a bitmap cursor Task-number: QTBUG-30016 Change-Id: I53eeda6bb5f6cab66e3bc10a2e5382ce55cc1bab Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Windows: Send the input method event when the focus object is validAndy Shaw2015-03-301-1/+1
| | | | | | | | | | Change-Id: I072d4b0bc754f73507c2de96d7e155f13a993594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * xcb: Fix bgr888 VNC sessionsLaszlo Agocs2015-03-304-9/+53
| | | | | | | | | | | | | | | | | | Introduce a slow path for 24 and 32 bit BGR. We don't care about performance here but it has to show the correct colors. Task-number: QTBUG-42776 Change-Id: Ic73e8ca3950b2b956f06643165dcfac51e7540f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * testlib: Detect distribution name/release for blacklisting testsCaroline Chao2015-03-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | Add possibility to blacklist distributions using the syntax: "<productType>" and "<productType>-<productVersion>". productType and productVersion are the values returned by QSysInfo::productType() and QSysInfo::productVersion() (in lower case). Change-Id: Iefd948127dd2133c2f2ab7aeb5b0c9749c3df6c5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Fix "'QCss::Property' is not a class or namespace"Andrew Knight2015-03-301-11/+11
| | | | | | | | | | | | | | | | | | | | | | As reported by GCC 4.9.2 x86_64-linux-gnu. The error message is correct; QCss::Property is the name of an enum. Change-Id: I9fb29d39ac11a644b7b08227f102594b3f3017f0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Debao Zhang <hello@debao.me> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * fix C4275 warnings for MSVC 2010 buildDebao Zhang2015-03-281-1/+2
| | | | | | | | | | | | | | | | | | | | This issue had been fixed by SHA: a12a2fdf684a6fc19aefc14f32842deab0270e86 but re-introduced by SHA: c23d1c76953704ecb52c833d7ef1de2e2f89b1e6 again. Task-number: QTBUG-45085 Change-Id: If98ee108335d80035179a83b1b28f384395d8373 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * Add tests for detach on setDevicePixelRatio()Morten Johan Sørvig2015-03-240-0/+0
| | | | | | | | | | | | Change-Id: I414ff0b794e0202a7f8c931b59b973cb1e7dc148 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Build bundled freetype as qt_helper_libKonstantin Ritt2015-03-276-77/+88
| | | | | | | | | | | | | | | | And thus do not disable warnings for the whole module when configured with -qt-freetype. Change-Id: I601a7c2990c8e3377531a28078db73800c138ec1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * QItemSelectionModel: Make selectedIndexes a Q_PROPERTY.Stephen Kelly2015-03-272-1/+7
| | | | | | | | | | | | | | | | | | | | With reasoning similar to commit v5.5.0-alpha1~124 (Make the QItemSelectionModel::selection a property., 2015-02-25), this should be a property instead of a Q_INVOKABLE so that it can participate in persistent bindings. Change-Id: Ib9a7900dfa3acbd6f9f7df7b6f00deb6e05c3937 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Add tests for detach on setDevicePixelRatio()Morten Johan Sørvig2015-03-240-0/+0
| | | | | | | | | | | | Change-Id: I414ff0b794e0202a7f8c931b59b973cb1e7dc148 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Tests: remove insignificant flag for dbus tests on osxCaroline Chao2015-03-2714-27/+0
| | | | | | | | | | | | | | | | | | Tests are now passing in CI. Change-Id: I0051fb7070c1c1027c557eba9dde6367ad59ac7a Task-number: QTQAINFRA-837 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add QT_Q_FLAG for Qt::MouseEventFlag.Friedemann Kleint2015-03-271-0/+1
| | | | | | | | | | | | | | Enable formatting it in debug streaming operators. Change-Id: I92efb70471653bbd4d91588f333ee132b392bf0c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * Add XCTest logger backend to QtTestLibTor Arne Vestbø2015-03-2710-5/+780
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be active when running test apps through Xcode's 'test' action, and reports QtTestLib test objects and functions to Xcode as XCTest cases. This allows running tests on both iOS Simulator and iOS devices from the command line, through xcodebuild, without relying on any 3rd party tools. It also integrates Qt test failures and passes into the Xcode IDE, which may be useful for closer investigation of test failures. The feature is limited to Xcode 6.x. Change-Id: I33d39edbabdbaebef48d2d0eb7e08a1ffb72c397 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * Re-generate the time zones database from CLDR v.27Konstantin Ritt2015-03-272-1042/+1073
| | | | | | | | | | | | | | [ChangeLog][QtCore] QTimeZone data updated to CLDR v.27 Change-Id: Ic25229d86ac4752ed70f5a729fd33c1a837241dc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix time offset for several time zonesKonstantin Ritt2015-03-272-11/+11
| | | | | | | | | | | | | | They are in UTC-03:00, not in UTC+03:00 (just a C&P typo). Change-Id: Ib342b65967404b8756c62953258b17421b9245af Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Update CLDR to v27Konstantin Ritt2015-03-277-4579/+5074
| | | | | | | | | | | | | | | | | | | | | | | | | | + A bunch of fixes in the locale data + New scripts from Unicode 7.0 + New locales - Some locales disappeared (aa_DJ, aa_ER, st_LS, ss_SZ, swc_CD, tn_BW) - Some locales lost their contents (i.e. en_Dsrt_US) [ChangeLog][QtCore] QLocale data updated to CLDR v.27 Change-Id: Iba8c7884f8087e577cbb25a8fc106dd7bd3ebb5d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * [QLocaleData] Extract defaultContent localesKonstantin Ritt2015-03-273-1800/+1869
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds some locales missing in the common/main/ directory, namely: bss_CM, cch_NG, dv_MV, gaa_GH, gez_ET, ha_Arab_NG, iu_Cans_CA, kaj_NG, kcg_NG, kpe_LR, ku_Latn_TR, mi_NZ, ms_Arab_MY, mn_Mong_CN, nds_DE, ny_MW, oc_FR, sa_IN, sid_ET, tk_Latn_TM, trv_TW, tt_RU, ug_Arab_CN, wa_BE, wo_Latn_SN See http://www.unicode.org/reports/tr35/tr35-info.html#Default_Content for more info. Change-Id: I6b3082d370a21da64fbd5e72ab6344e1d7a6a3c9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Re-generate Unicode data tablesKonstantin Ritt2015-03-272-6294/+7321
| | | | | | | | | | Change-Id: I289537377f37c36f88de9662bbb7ad108bdc9383 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Update Unicode data up to v7.0Konstantin Ritt2015-03-278-44/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Two newly adopted currency symbols: the Azerbaijan manat and the Russia ruble * Pictographic symbols (including many emoji), geometric symbols, arrows, and ornaments originating from the Wingdings and Webdings sets * Twenty-three new lesser-used and historic scripts extending support for written languages of North America, China, India, other Asian countries, and Africa * Letters used in Teuthonista and other transcriptional systems, and a new notational set, Duployan For more details, see http://www.unicode.org/versions/Unicode7.0.0/ The Properties struct's .*Diff members were narrowed down to signed 15 bits and the unicodeVersion has been expanded to 8 bits. [ChangeLog][QtCore] Unicode data updated to v.7.0 Change-Id: I93ab6f79fa3b05f61abc7279f1d046834c1c1a0b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Update UCD source files to v7.0Konstantin Ritt2015-03-2719-25489/+7342
| | | | | | | | | | Change-Id: I47277963c926128ad0c4ac5141835e767bb440a7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Make versioned OpenGL functions working with the subclass patternLaszlo Agocs2015-03-275-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOpenGLFunctions allows both deriving from it and getting an instance via QOpenGLContext::functions(). Unsurprisingly a large number of users attempt to use the versioned function wrappers in the same way. Unfortunately this approach was not that well supported. Besides some potential base class exporting issues the real blocker for QOpenGLWidget - or any versionfunction subclass whose associated context changes during its lifetime - is that the functions instances could only be initialized once. Unlike instances retrieved via QOpenGLContext::versionFunctions(), instances created "manually" were not deinitialized upon the destruction of the associated context because context did not know about them. A pattern like initializeOpenGLFunctions(); delete context; create new context and make it current initializeOpenGLFunctions(); is working fine in QOpenGLFunctions-derived classes but not with the versioned ones. To overcome this, start registering such instances to the context too. QOpenGLContext::destroy() can then reset the internal state so a subsequent initializeOpenGLFunctions() will reinitialize properly instead of bailing out mistakenly thinking that everything is ready to use. Task-number: QTBUG-45199 Change-Id: Ia1420bcccb33c51508698b7a1b036c7544a66e74 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * xcb: Do not crash with VNCLaszlo Agocs2015-03-272-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When having a vnc server with pixel format bgr888, we may not have a working GL integration. (we may not have one regardless of the pixel format in fact) We should still keep on attempting to create a regular SHM window for RasterGLSurface windows too, to keep regular widgets apps working. Task-number: QTBUG-42776 Change-Id: Idbf8de29694613b240bd27affcc3d80810ce1460 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Add tests for detach on setDevicePixelRatio()Morten Johan Sørvig2015-03-240-0/+0
| | | | | | | | | | | | Change-Id: I414ff0b794e0202a7f8c931b59b973cb1e7dc148 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * Windows: Support virtual folders as initial directory for file dialog.Friedemann Kleint2015-03-274-19/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | Use the scheme "clsid" to be able to pass them as "clsid:<GUID>" (with '{', '}' stripped). Task-number: QTBUG-33962 Change-Id: Ib045fe81518bca6e91588007ce8a245a48479b1f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Patrick Spendrin <patrick.spendrin@kdab.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * qdoc: No internal qmlabstract types in the "inherited by" listMartin Smith2015-03-274-5/+6
| | | | | | | | | | | | | | | | | | | | | | This update ensures that there are no internal QML types in a QML type's "inherited by" list. It also fixes a bug that caused the "inherited by" lists to be empty when running qdoc in the single-exec mode. Change-Id: Iee8b9dbcd56a09b7a49ec8a703b5d861f0b1f0ec Task-number: QTBUG-44004 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * qdoc: Update for classes in namespacesMartin Smith2015-03-275-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resolving of namespaces across module boundaries was moving all the nodes for elements contained in the namespace into the namespace node for the \namespace command for that namespace. But moving class and namespace nodes is wrong because they are actually in different modules where they should also be output. This update to the fix for the original bug leaves the class and nested namespace nodes where they are but adds them as special "orphan" nodes to the namespace node that has the \namespace command. These orphan nodes are then included in the namespace content list when it is written out. Change-Id: I0eee368ed39f28129b5b43bb4a16963961f53db3 Task-number: QTBUG-44688 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * qdoc: Add details to messages about not finding files.Friedemann Kleint2015-03-272-3/+9
| | | | | | | | | | | | | | Print example directories and files. Change-Id: I58553f45f87ec2c2036a8c4ddf9ffb54baa75870 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * add DISTFILES support for Visual Studio projectsJoerg Bornemann2015-03-275-0/+23
| | | | | | | | | | | | | | | | | | | | Files in DISTFILES are placed into a "Distribution Files" folder under the project node. Task-number: QTBUG-43162 Change-Id: Ib75aacf1010d9ea63af89d4a9cc92275d714b3cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>