summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * eglfs: Allow using a different framebuffer deviceLaszlo Agocs2014-01-162-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now /dev/fb0 is hardcoded. This is not ideal. Therefore QT_QPA_EGLFS_FB is introduced. This environment variable can be set to a different framebuffer device. Once it is set, eglfs will use the specific device. This is similar to linuxfb's fb=... plugin parameter. The actual behavior depends on the board-specific implementations. For now only iMX6 has real support. It extracts the index from the device name as bind the EGL display to the corresponding framebuffer using the vendor-specific fbGetDisplayByIndex(). Other hooks can follow suit later on. With this patch eglfs is at least on par with linuxfb, meaning that, if the board supports it, different apps can run on different screens. Task-number: QTBUG-36113 Change-Id: Ia3c88bd06e108bc668433e3c5c3fce34a5a0e73d Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| | * Android: Don't register main thread on loading libraryEskil Abrahamsen Blomfeldt2014-01-164-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with debug, all SLOT or SIGNAL macros will expand to a function call, and then function will call QThreadData::current(), which will set QCoreApplication::theMainThread if it has not already been done. Since Qt Widgets has these macros in the static initialization of the library, we would register the Android main thread as the main thread of Qt, which would mean that the actual application object was created on a different thread than the main thread. This caused warnings to appear, and also triggered a race condition which caused widget applications to sometimes show a black screen instead of content on startup when run with the OpenGL plugin. Task-number: QTBUG-35048 Change-Id: Ie8979f5e7cd5662f8d7dd276de9f94f27cc120b5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Android: QStandardPaths implementationChristian Strømme2014-01-162-0/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds standard paths implementation for Android. [ChangeLog][QtCore][QStandardPaths] Added QStandardPaths implementation for Android. Task-number: QTBUG-34631 Change-Id: I38673204a521a990438470c4e165105a2b02b7ad Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Android: Add convenience function to get the API level.Christian Strømme2014-01-162-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's common to check the Android API level at runtime to determine what functionality is available. This change provides a convenient way to get the Android SDK version (API level) from c++. Change-Id: I88f65ae87e0fa8ac0affefffbd1b1bba855c9f46 Reviewed-by: BogDan Vatra <bogdan@kde.org>
| | * Fix unused-function warning in qdrawhelper.cppThiago Macieira2014-01-161-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storePixel<QPixelLayout::BPP32> would have been called by storePixels<QPixelLayout::BPP32> but that function has an overload that uses memcpy instead. So it's really unused. Found by Clang 3.4. Change-Id: I661804e273486d3469221fdd362a24cd77cfb8a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * Doc: Fix suggest parentheses GCC warningJonathan Liu2014-01-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I96cb76da7d260d08133830de72b0ff6e6a5099be Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Bump Qt version to 5.2.2Sergio Ahumada2014-01-151-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia7dd68e0a280d12eba28932b4c5edb9948310a1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Document QAbstractItemModels::roleNames() better.Mitch Curtis2014-01-151-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | List all of the default role names, and mention that the function must be overridden if the model is used within QML. Change-Id: I6ced5ac74143dcb97c527da2a6a23aa9d21f70e5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Fix some typosKurt Pattyn2014-01-151-3/+3
| | | | | | | | | | | | | | | Change-Id: I673ad09e458438b921fa093190bd983e8f9749b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Minor optimization use QString midRef instead of mid.Jędrzej Nowacki2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | It doesn't create a temporary string. Change-Id: If5c540422f69e573107d1f5a886ac7174ae99853 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix typo in QTextEdit documentationSimon Hausmann2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-36077 Change-Id: I5cd9ad3fe309e5dd2e5e5d67d6c7561182e65c25 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Clear read- and write buffersKurt Pattyn2014-01-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added calls to clear the write and read buffers when - setSocketDescriptor is called - abort is called Removed clears the read and write buffers from the documentation of resetSocketLayer. Added documentation to setSocketDescriptor describing that read and write buffers are cleared. Task-number: QTBUG-28914 Change-Id: I25a4b679708bdea0b259c50f1d10a3e9271dabb9 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| | * qdocconf: Remove nonexistent dependencySze Howe Koh2014-01-151-1/+0
| | | | | | | | | | | | | | | Change-Id: I9d2f36102691a2bd8ab0697d20f6eac59d59a84f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * Saving physical size changes of screen on WindowsCyril Oblikov2014-01-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | On windows (tested on win7) physicalSizeMM is changed after changing screen resolution. We need to save new size. Change-Id: I1b38d9ba2af9679812a973737a724c9a9c5395da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Windows: Use focusWindow() as native dialog parent when 0 is passed.Friedemann Kleint2014-01-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A parent is required, otherwise the application gets deactivated when the dialog closes. The same is done in Qt 4. Task-number: QTBUG-36039 Change-Id: I56688b3259f1d207edd1bec499afd1365ae511dc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * MIPS DSP build system fix and additional optimizations.lpapuga2014-01-1414-9/+2130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed MIPS DSP portion of the mkspecs/features/simd.prf file in order to fix the corrupted build system for MIPS platforms. List of the additionally optimized functions from file src/gui/painting/qdrawhelper.cpp: - qt_blend_rgb16_on_rgb16 - qt_fetchUntransformed_888 - qt_fetchUntransformed_444 - qt_fetchUntransformed_argb8565 from file src/gui/image/qimage.cpp: - convert_ARGB_to_ARGB_PM_inplace from file src/corelib/qstring.cpp: - ucstrncmp - toLatin1_helper - fromLatin1_helper Change-Id: I5c47a69784917eee29a8dbd2718828a390b27c93 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Correct wordwrapped text handling in QListView icon modeSamuel Gaist2014-01-142-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently a QListView with wordwrapping activated will wrap the text only to the width of the icon even if the grid size is bigger. With this patch the option rect is now updated to match the grid size if valid and the style uses it to determine the correct size when wrapping [ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping when available in icon mode Task-number: QTBUG-4714 Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Windows: Do not print test output to both stdout and system debug logKai Koehne2014-01-132-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid piping the test output to both the Windows system debugger, and stdout. This fixes duplicate output in Qt Creator, which displays messages from both sources. [ChangeLog][QtTestLib] The (default) plain text logger on Windows now logs to either the system debug log (in case no console is open), or stdout, not both. Task-number: QTBUG-34630 Change-Id: I35fe9f4a50cc660d79fad7dffa6d19659b2102ae Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Mac: Remove old unified toolbar implementation.Morten Johan Sørvig2014-01-138-705/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been dead code in Qt 5 since WS_MAC isn't defined any more. The new implementation is far less intrusive and does not require a separate layout. Task-number: QTBUG-34411 Change-Id: I91bf2294086cb7334a0f56eb1bb97464d8d7b2e3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Fix typos in commentsKurt Pattyn2014-01-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Comments contained some typos. Comments have been replaced with the ‘official’ description from http://msdn.microsoft.com/en-us/library/8x5x43k7.aspx. Change-Id: I25dda0911735b4a0d4f306bc95bc984be0080e2f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * QNX: Fix compiler warning about unused variable.Sérgio Martins2014-01-121-0/+1
| | | | | | | | | | | | | | | Change-Id: I16e4aa32647793bf36fee60ed94db69a6ae2d8ea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Mac: remove unified toolbar workarounds.Morten Johan Sørvig2014-01-121-25/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMainWindow::unifiedTitleAndToolBarOnMac() will again return true, but the new implementation is much more similar to the cross platform one so these workarounds are not needed. Task-number: QTBUG-34411 Change-Id: Ic95f491af94354776385dc984f1a00c64429a3f0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Mac: Update unified toolbar drawing code.Morten Johan Sørvig2014-01-121-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fill the toolbar background with transparent pixels to allow the view background to shine through. Draw a separator line using HITheme. Task-number: QTBUG-34411 Change-Id: I57732564a67a5a9d1eb7fd9038382b2b65be50a4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Fix Use android theme when definedThorsten Zachmann2014-01-111-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to define the theme to use for android in the AndroidManifest.xml. If it is defined in the activity qt itself should not overwrite it. The change uses the defined style in case it is given in the AndroidManifest.xml. This seems to fix also QTBUG-35151. Task-number: QTBUG-35050 Change-Id: I8b55c02ca1ecd7baa5f2f9460d154095aacf015f Reviewed-by: BogDan Vatra <bogdan@kde.org>
| | * Mac: Update PE_IndicatorToolBarHandle drawing.Morten Johan Sørvig2014-01-111-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Smaller, rounder, darker toolbar handles. Works especially well in unified toolbar mode. Task-number: QTBUG-34411 Change-Id: I41eafdf0bb1dbbb4ed96d7bd799eb6f53bccbf7d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Enable window dragging code in QToolBar on MacMorten Johan Sørvig2014-01-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allows moving the window by dragging the unified title and toolbar area. Task-number: QTBUG-34411 Change-Id: Idd85c0031895b5afd7dfdc8616e4452c47935af2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * QDate - Fix parsing Qt::ISODateJohn Layt2014-01-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix parsing of ISO Date from being totally lenient to being semi-strict by requiring the separator positions to be non-numeric. [ChangeLog][Important Behavior Changes] Parsing of Qt::ISODate by QDate::fromString() and QDateTime()::fromString() is not as lenient as before, the date component separators are now required to be non-numeric. This means a string like "2000901901" will no longer be recognized as a valid ISO Date, but "2000/01/01" will still be even though it doesn't strictly meet the ISO format of "2000-01-01". Task-number: QTBUG-34141 Change-Id: I0e481144136c60d4cac61364b9b2c1d2cd1e78fc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * QDateTime - Fix isValid() if invalid QTimeZoneJohn Layt2014-01-111-0/+9
| | | | | | | | | | | | | | | | | | | | | Explicitly check that the QTimeZone is valid before trying to use it. Change-Id: Iec415a2cb07071502fe71ee5ac92a7657e818f99 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * QLocale - Check day number is validJohn Layt2014-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | Check day number falls in valid range before using as array index. Change-Id: I8d7c203b97988633fe4c345d5e7002bba9c2c68b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Fix to comply with Qt coding guidelinesKurt Pattyn2014-01-111-32/+19
| | | | | | | | | | | | | | | Change-Id: Ie6c62d3107d17e64c94fa01380b3b1d80f24d0de Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| | * Cocoa: Add setContentBorderThickness().Morten Johan Sørvig2014-01-116-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setContentBorderThickness() to the Cocoa platform plugin. This functions requests that the platform plugin draws a gradient in the unified title and toolbar area and/or the status bar area. The background gradient is drawn before and under the Qt backing store content. It is expected that parts of the backing store will be filled with transparent pixels to allow the gradient to be visible. To facilitate this the backing store image is created with an alpha channel. Task-number: QTBUG-34411 Change-Id: Iadc5e64ee9b9b42e92fb84a615817fdffd7a8802 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| | * Fix kms build with -qtnamespaceSérgio Martins2014-01-112-3/+5
| | | | | | | | | | | | | | | | | | Change-Id: I6aa3f3bc3c098b96ec0eec369b85a938c552f364 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| | * make 'AlwaysAsk' if found help determine whether the configuration is ↵Lorn Potter2014-01-112-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered or not. Since bearer has no idea about user interaction, we just do this, and make the roaming/always ask scenario unavailable. Change-Id: Id509a4d3346cdbb9367ddb465364c3500fc62fdf Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * fix connman QNetworkConfiguration DiscoveredLorn Potter2014-01-111-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Discovered depend on autoconnectable service This stops seemingly automatic use of a non autconnectable service, and allows the connection dialog to popup. Change-Id: Idea9a22eb4bbfb4fefeca7867526a2ddc3954376 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * update the network configuration listLorn Potter2014-01-114-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | when changes in the networks happen. Task-number: QTBUG-34021 Change-Id: I2bd187e7d04d6876294f18d917c9a384afe5db35 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * Make qtbase compile with QT_NO_TEMPORARYFILETasuku Suzuki2014-01-101-1/+4
| | | | | | | | | | | | | | | Change-Id: I0211ed44513723392e3f50b76be10b95c0bcddd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Make qtbase compile with QT_NO_GESTURESTasuku Suzuki2014-01-103-0/+9
| | | | | | | | | | | | | | | Change-Id: I90f173265e177ff37ce80da3983080651856259d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Don't force create the platform window.Morten Johan Sørvig2014-01-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes all sorts of unintended side effects and is generally a bad idea. Task-number: QTBUG-32988 Change-Id: Iebdae34764be4cfd9ced47aa93789871e0455ab3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Make qtbase compile with QT_NO_DOMTasuku Suzuki2014-01-101-0/+1
| | | | | | | | | | | | | | | Change-Id: I98bef84ca9bf86bf7dddd3ca2a3d8210a8e46a16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Allow printf style for qCDebug, qCWarning, qCCritical macrosKai Koehne2014-01-216-8/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for using qCDebug and friends in the 'printf style' way. This allows an almost mechanical conversion of existing qDebug, qWarning, qCritical macros, and allows avoiding the size overhead the streaming style incurs (mostly due to inlined QDebug code). To handle this gracefully we require variadic macros (part of C++11/C99). For compilers not supporting variadic macros we fall back to checking the category in QMessageLogger. [ChangeLog][QtCore][Logging] Allow qCDebug macros to be used in a printf style. Change-Id: I5a8fb135dca504e1d621bb67bf4b2a50c73d41b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QWindowVistaStyle: Always initialize text color of menu items.Friedemann Kleint2014-01-211-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtWidgets][QMenu][Windows] Correctly use text color set by style sheet for menu items. Task-number: QTBUG-36142 Change-Id: I142f2fd82164771b45bf599a6afa1121fcfd2187 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | Android: Remove debug output from platform windowEskil Abrahamsen Blomfeldt2014-01-211-6/+0
| | | | | | | | | | | | | | | | | | | | | Some debug info and a #warning had somehow made it through :) Change-Id: I420a7637bfd5d1a79a342eacefcc35430994feff Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Testlib: Use QString for messages in QAbstractTestLogger::addMessage()Friedemann Kleint2014-01-218-27/+25
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35743 [ChangeLog][QtTest][Windows] Use correct UTF-8 encoding for XML test results on platforms with different console encoding. Change-Id: Ice9d03192098f931e5dac358928e0c4421ab715e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Ensure weak ciphers are not part of the default SSL configuration.Richard J. Moore2014-01-213-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any cipher that is < 128 bits is excluded from the default SSL configuration. These ciphers are still included in the list of availableCiphers() and can be used by applications if required. Calling QSslSocket::setDefaultCiphers(QSslSocket::availableCiphers()) will restore the old behavior. Note that in doing so I spotted that calling defaultCiphers() before doing other actions with SSL had an existing bug that I've addressed as part of the change. [ChangeLog][Important Behavior Changes] The default set of ciphers used by QSslSocket has been changed to exclude ciphers that are using key lengths smaller than 128 bits. These ciphers are still available and can be enabled by applications if required. Change-Id: If2241dda67b624e5febf788efa1369f38c6b1dba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Support logging direct to journald, if enabled.Robin Burchell2014-01-212-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of merely intercepting logging output from stdout/stderr from the journal side of started processes, this has the advantage of meaning that the origin process name will be correct. fprintf won't work, because if a process starts children (like e.g. a homescreen does), then their stdout/stderr are merged into their parent, and journal has no way of differentiating the origin. We are also able to store information about the context of logging, which might be useful in post-mortem cases. [ChangeLog][Platform Specific Changes][Linux] Systems with systemd may now pass -journald to configure to send logging output to journald. Logging will still be sent to stderr for interactive applications (run from a tty) or with QT_NO_JOURNALD_LOG set to a non-empty value. Change-Id: Ib260cec1ea87390bf44f267d217d795583407d00 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix compilation error on FreeBSDGabriel de Dietrich2014-01-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | timezone is defined differently in FreeBSD compared to other (more or less) POSIX-compliant Unices. Task-number: QTBUG-36080 Change-Id: I4ad1a5ccd0b9ddbadb9fdd90edc26cf0c7252dfb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | xcb: Do not leak when compressing eventsLaszlo Agocs2014-01-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The event must be freed in all cases, also when a motion or configure notify is skipped. Change-Id: Ie55e62d0c3ab25bd9b20cc85098ea337d0b1ac5d Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Use pkg-config to find the prefix for X11 installGabriel de Dietrich2014-01-203-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to run the XKB extension where we used to expect X11 to be installed in /usr. In FreeBSD, for instance, X11 is installed in /usr/local like all the other not out-of-the-box packages. Same thing goes for the compose platform input context plugin. Change-Id: Ib7ace3117eaacc6e150394450d1330cba654ba8a Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* | | Document qRemovePostRoutine() function and update qAddPostRoutine() docBartosz Brachaczek2014-01-201-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qRemovePostRoutine() function has been added as publicly exported function in Qt 2.2.0 with behavior equivalent to that of today. It has never been documented for unknown reasons, possibly simply forgotten. This function provides needed symmetry for the already documented qAddPostRoutine() function and is used in some real world applications. Change-Id: Ied4709505d8335c883e9791ea634df8fb406d995 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
* | | Remove duplicated code from moc generatorJędrzej Nowacki2014-01-201-6/+0
| | | | | | | | | | | | | | | Change-Id: I0d603ac39068f796fc7397a74230d544a16e0371 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>