summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Update HarfBuzz-NG path on MacKonstantin Ritt2014-02-131-1/+1
| | | | | | | | | | 84be1bd4d3ed8d2d9e65301649bc841ea4197fe2 has changed the stored data type from QFontEngine to QFontEngine::FaceData. Update the implementation and revert changing the y_scale sign on non-Mac (aka fix-up 2d576f79f748ca4c9bb54634f0fd44fa207a2248). Change-Id: I4180257bc8f610fb014fd2a2ad6f8fdceece2f13 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
| * Fix compilation of ANGLE with mingw-tdm64 gcc 4.8.1Kai Koehne2014-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Do not rely on sprintf_s being declared/defined. This also fixes deployment to Windows XP. See https://chromium-review.googlesource.com/#/c/182975/ for a similar commit proposed upstream. Task-number: QTBUG-36242 Change-Id: I520e2f61aeab34963e7a57baafd413c7db93f110 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Make HarBuzz-NG the default shaper on MacKonstantin Ritt2014-01-313-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we dropped all platform-related shapers during the QPA refactoring, thus making HarfBuzz the only shaper on all platforms, we can not deal with AAT-capable fonts anymore. HarBuzz-NG now supports it's own shaper backend infrastructure, so the decision was to enable HB's CoreText shaper backend on Mac and simply make HB-NG the default shaper there. Task-number: QTBUG-36056 Change-Id: If22e24fd5cc00c25952934332a2f4123f38135a4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Add CoreText HB-NG shaper backend on MacKonstantin Ritt2014-01-303-0/+869
| | | | | | | | | | | | Change-Id: Ida705b9fc59d41a04cb754faae58774bfc2e656c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Update HB to 7691a154e50f8c8c77bbd94787686262955bf5d4Konstantin Ritt2014-01-3032-1457/+2307
| | | | | | | | | | Change-Id: I7dae9d74f338d3beeb1677a1676a07b66c05bb93 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Use pkg-config to find the prefix for X11 installGabriel de Dietrich2014-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Replace win32-g++ with mingw scopeKai Koehne2014-01-171-1/+1
| | | | | | | | | | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-101-0/+1
|\| | | | | | | Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
| * zlib: rename z_errmsg symbol to avoid name clash when linking staticallyTim Blechmann2014-01-091-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-35301 Change-Id: I298fba7270ee49d4e2dfc624b18aa13ce25864be Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Apply the fix stated in PCRE bug #1423Giuseppe D'Angelo2014-01-022-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | There is JIT misoptimization found during code refactoring that affects PCRE 8.34 (the version currently bundled with Qt). The upstream might not release a specific bugfix release before 8.35, hence the patch has been manually applied. Upstream issue: http://bugs.exim.org/show_bug.cgi?id=1423 Change-Id: I8dbbb2981bc037d39b30fcaded6894ee9820b8df Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-2457-1017/+3946
|\| | | | | | | Change-Id: I2defae1904154283446b069d151c3ef57302ec7b
| * Update bundled HarfBuzz sources up to 0.9.25Konstantin Ritt2013-12-1956-1017/+3945
| | | | | | | | | | | | | | | | | | | | Most important changes: - Myanmar, Indic, Javanese / Buginese shaper improvements - More aggressive shape-plan caching - Additional OpenType language tags Change-Id: I54ed62cfe936c06c18589d09ac119a0f5881a235 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * BlackBerry: fix sqlite plugin compilationRafael Roquetto2013-12-161-0/+1
| | | | | | | | | | | | | | | | | | _QNX_SOURCE needs to be defined in order to ensure posix_fallocate gets declared by the toolkit header files. Change-Id: Id60fcf9be3c672bd399c4b71541dfa0fcc4060af Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Upgrade the PCRE bundle to 8.34Giuseppe D'Angelo2013-12-1935-3630/+6580
| | | | | | | | | | | | | | | | | | | | | | | | New upstream version, changelogs at: http://pcre.org/news.txt http://pcre.org/changelog.txt Qt still requires 8.30. Change-Id: I76794a3079601b07c469b952367f71f794079edc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | update bundled sqlite to 3.8.2Mark Brand2013-12-173-5488/+7367
| | | | | | | | | | | | | | | | | | The "Fixed CE build of sqlite3" patch is preserved in this change. (ea70ec8711af45128d63634a01dfc4c1a51ac331) Change-Id: I41a268bd077e396810965ca27cd572cef7259d58 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2013-12-092-2/+3
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-052-2/+3
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
| | * qtbase: Fix build error on 64bit BigEndian platformsVicente Olivert Riera2013-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions fromBytesToWord() and fromWordToBytes() are called when building on 64bit BigEndian platforms. It fails because those functions are disabled on the source code. Enabling those functions for 64bit BigEndian platforms fixes the problem. Task-number: QTBUG-35228 Change-Id: I5ccacd4fb5051df05f67c8da879b3a9e49953861 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Detect posix_fallocate at configure timeFatih Aşıcı2013-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing feature macros is not enough for uclibc. Fixes build of the built-in sqlite3 with uclibc <= 0.9.33.2. Later versions will have posix_fallocate(). Change-Id: I918a52777ac63624635802221effc6b86fa2269c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | ANGLE D3D11: Fix build on desktop WindowsAndrew Knight2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | This fixes a missing declaration caused by 11a2226c Change-Id: I4b8092c6b9592e886353af9193686238105a1512 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | | ANGLE: Dynamically load D3D compiler from a list or the environmentAndrew Knight2013-12-091-8/+36
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | If the default compiler cannot be found, load it from a list of DLL names. On Desktop Windows, the default compiler can be specified by an environment variable, QT_D3DCOMPILER_DLL. This can also be set at compile time by a define of the same name. Otherwise, the default compiler DLL is that which is set by the Direct3D SDK. On WinRT, the default compiler is d3dcompiler_qt, which is a non-versioned compiler proxy provided by Qt. Change-Id: I0d7a8a8a36cc571836f8fa59ea14513b9b19c19b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | ANGLE D3D11: Always execute QueryInterfaceMaurice Kalinowski2013-12-031-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | ASSERT removes the condition when building for release mode. However, QueryInterface must be called in any case. Adopt to using ASSERT(false) like in other occurrences in angle. This is a follow-up patch to 331bc16afd23414493b842819e0b747e8f364243 Change-Id: I4413bab06b5a529fcbd09bbc20828fcdcf4e4fc6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-266-7/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-262-2/+17
| |\ | | | | | | | | | Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
| | * Fix xkb.h compile warning on 32 bit systemsGatis Paeglis2013-11-212-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message: ../../../3rdparty/xcb/include/xcb/xkb.h:118:5: error: this decimal constant is unsigned only in ISO C90 [-Werror] From the C89 standard: "The type of an integer constant is the first of the corresponding list in which its value can be represented. Unsuffixed decimal: int, long int, unsigned long int;" In the later standards "unsigned long int" is removed from the "Unsuffixed decimal" list. If integer constant is suffixed by the letter u or U, then the list is: unsigned int, unsigned long int, .. "unsigned long int" is sufficient on 32 bit systems to store the values of XCB_XKB_CONTROL_PER_KEY_REPEAT and XCB_XKB_CONTROL_CONTROLS_ENABLED Task-number: QTBUG-34142 Change-Id: Ic23781fcd00d4901ec9bb5a85068f4315c14bfb8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Avoid compiler warning about alignment for MSVC2013 (x64)Jan Arve Saether2013-11-152-4/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Only align if we actually *need to* (due to SSE/XOP usage) The code will currently not compile as it is now with UseSSE or UseXOP defined, (so the ALIGN macro could just be totally removed). In order to keep the diff to upstream as small as possible, we keep the ALIGN macro definition. Task-number: QTBUG-34362 Change-Id: I6cf420205896e3a476cdcfbf3308a07e0ae0c84e Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix compilation with MinGW gcc 64 bitKai Koehne2013-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix compilation of ANGLE with gcc 4.8.0 64 bit: The reinterpret_cast<unsigned long>(void*) was causing error: cast from 'const void*' to 'long unsigned int' loses precision Task-number: QTBUG-34395 Change-Id: Ibde75dd4b5536f3827bdf0ab02a15e93a1a8a4f0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * ANGLE: Fix compilation with MSVC2013.Friedemann Kleint2013-10-241-0/+2
| | | | | | | | | | | | | | | | Add missing include for std::min(), std::max(). Change-Id: I740e5db94f9f958ac65de8dd7baab7e203482637 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | libjpeg: Define NO_GETENV for WinRTAndrew Knight2013-11-181-0/+2
| | | | | | | | | | | | | | | | getenv isn't available on this platform, and has been stripped from the lib starting with MSVC2013. Change-Id: I5a69055b7c3ca85dc6d5a74c5b2842e7886b13bd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | ANGLE: Enable D3D11 for feature level 9 cardsAndrew Knight2013-11-1718-106/+256
| | | | | | | | | | | | | | | | | | | | | | Enable use of ANGLE on lower-end hardware, such as Surface RT and Windows Phone 8. Based on https://codereview.appspot.com/12917046/ Change-Id: Ice536802e4eedc1d264abd0dd65960638fce59e4 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fixed CE build of sqlite3Bjoern Breitmeyer2013-11-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updated sqlite3 lacks a forward declaration of localtime. Depending on the CE version that forward declaration was sometimes available. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (forward-ported from commit fb1649d30b0542a69a534218e96950d0533dec8b) Change-Id: Ief6d8ed1cad51fa92a333a20c5dfe781d19761eb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (forward-ported from commit ea70ec8711af45128d63634a01dfc4c1a51ac331) Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | update bundled sqlite to 3.8.1Mark Brand2013-11-143-6420/+9795
| | | | | | | | | | | | | | | | Change-Id: Id75bf901c9014419eddbe2d0e5a75ee274b17914 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Fatih Aşıcı <fatih.asici@gmail.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-241-1/+1
|\| | | | | | | Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
| * Fix compilation of ANGLE on MinGWKai Koehne2013-10-151-1/+1
| | | | | | | | | | | | | | | | This broke with commit 89f9bc9c5f873d6763e35d2f92d31c28f8fb5262. Task-number: QTBUG-34080 Change-Id: Ib3c7a3c90db7dc04f417eba4c1328390f45e5e5f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-111-1/+5
|\| | | | | | | Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
| * Fix compilation for MSVC 2008 and std::tupleThomas Hartmann2013-10-091-1/+5
| | | | | | | | | | | | | | For MSVC 2008 make_tuple is in the tr1 namespace. Change-Id: I4a51f6cabdf068993869b404b12ed1484a21a9d4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | libpng: Add Windows Phone to existing WinRT defineAndrew Knight2013-10-021-1/+1
| | | | | | | | | | | | | | Treat Windows Phone as WinRT. Change-Id: I74e45a199629df3efaafa6acb05f991044f5c884 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | ANGLE: Support WinRTAndrew Knight2013-10-0221-62/+376
|/ | | | | | | | | | | | | | This enables EGL for WinRT's native types, and adjusts some codepaths to accommodate differences in between desktop Windows and WinRT. - WinRT native handles added to eglplatform.h - References to native handles in libEGL/libGLESv2 follow eglplatform.h - D3D 11.1 structures and methods used when necessary - TLS replaced with thread attribute - LocalAlloc/Free replaced with Heap API Change-Id: Ia90377e700d335a1c569c2145008dd4b0dfd84d3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* libpng: Add WinRT compatibilityKamil Trzciński2013-09-201-2/+5
| | | | | | | | | A _WINRT_ macro is added for Windows Runtime and a few codepaths are changed with it. Change-Id: I99ca5636d03c39b0a05b7f75f13522d012fdec07 Done-with: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* ANGLE: Update to version 2446Andrew Knight2013-09-19124-3476/+4866
| | | | | | | | | | | | | | | | | | | | | | | Update ANGLE and reapply patches. Patch changes: "Dynamically resolve functions of dwmapi.dll" Removed; ANGLE no longer uses DWM API "Make it possible to link ANGLE statically for single-thread use" Avoid name collision by using ANGLE-style getCurrent() "Fix build when SSE2 is not available." Added guard for __cpuid(), which is not available on ARM "Make DX9/DX11 mutually exclusive" Adjustments due to underlying code changes "ANGLE: Avoid memory copies on buffers when data is null" Removed; fixed upstream "Add missing intrin.h include for __cpuid" Removed; fixed upstream Change-Id: I4f3d850fc555d3194ddc05e0b51c4966d33f7eaf Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* WinRT: Disable PCRE JITAndrew Knight2013-09-161-0/+1
| | | | | | | | | That is what we do on on other "limited" platforms. Change-Id: I608880698d60ab10ecbb2f3ce12ff6c5eaab7eed Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Fixed sqlite build for WinRTOliver Wolff2013-09-151-0/+1
| | | | | Change-Id: Idf5bfa8b55e8d7db46207e55de1e9176def503a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* [2/2] Update bundled HarfBuzz-NG sources up to 0.9.20Konstantin Ritt2013-08-302-0/+5
| | | | | Change-Id: Ia8ef11fce9326ed708bf2972514b46b9d105ad9e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* [1/2] Update bundled HarfBuzz-NG sources up to 0.9.20Konstantin Ritt2013-08-3018-440/+662
| | | | | Change-Id: I8649bbe608cb2f79c721c900c03fd0139a8c0cd1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add stripped version of HarfBuzz-NG 0.9.19 sources to 3rdpartyKonstantin Ritt2013-08-2784-0/+33805
| | | | | Change-Id: I06fbf58131ebce51ce95921d8dfd65dd3d3e236f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make it possible to build HarfBuzz-NG in QtKonstantin Ritt2013-08-2715-0/+148
| | | | | Change-Id: Ib956adb0ab7bcfba3ce73acf7c19bda815d6eb73 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix compilation of libGLESv2 with older MinGW-w64 headersKai Koehne2013-07-111-0/+19
| | | | | | | | | | | | | | | Fix compilation of libGLESv2 for mingw-headers predating MinGW-w64 svn commit 5567 (like MinGW-builds gcc 4.7.2-rev8, the toolchain we officially support). Commit 5567 added the D3DCOMPILER_DLL define to d3dcompiler.h, but with a trailing semicolon that has then fixed in commit 5783. Any toolchain that ships MinGW-w64 headers from a version in between (like MinGW-builds gcc 4.7.2-rev11) will unfortunately remain broken. Change-Id: I31272a1a991c4fc0f1611f8fb7510be51d6bb925 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make PCRE's JIT work on Android devicesGiuseppe D'Angelo2013-06-193-0/+28
| | | | | | | | | | | __clear_cache is missing from Android; use cacheflush instead. Backport in Qt's own PCRE copy of the upstream fix: http://vcs.pcre.org/viewvc?view=revision&revision=1340 Task-number: QTBUG-31754 Change-Id: I4996265f7b19343ba24983d4f8b2f75e2b578504 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix xkbcommon.pri not to override QMAKE_CFLAGSJ-P Nurmi2013-06-121-1/+1
| | | | | | | Task-number: QTBUG-31585 Change-Id: I6628a8eececc34aef4cd358ad2c8b246d8845602 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>