summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-061-0/+2
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add support for QNX iconv implementation.Rafael Roquetto2012-02-031-2/+2
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-171-4/+0
| | | | | | | | | | the change is bogus; people were actually building it successfully. This reverts commit 0c70be512bfc40e8a2a09f60a66b7ecb114e748e Change-Id: I641fac34b78d6c23ead143d34a8ae15bf191cae3 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix for coreservices, it should be part of QPA testsAndy Shaw2012-01-171-5/+7
| | | | | | | | | Since the coreservices test should be part of the QPA ones after all, this reverts d317182e and fixes the original problem correctly by checking if qpa is on before testing for coreservices Change-Id: I476f56924ff2d9bbc2f290563aaff9528fe72766 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qnetworkproxy_mac.cpp was not compiled in on Mac for the network moduleAndy Shaw2011-12-211-7/+5
| | | | | | | | | | | The problem is that the coreservices configuration was not turned on due to the fact that the configure test was never ran. This is because the configure test was placed in the wrong platform section and would actually be ran for QPA and not Mac. Task-number: QTBUG-23302 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Symbian-linux crosscompilation configuration alignPasi Pentikainen2011-11-291-2/+3
| | | | | | | Change the configure-sh on Symbian linux crosscompilation to set rtti. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14361
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-11-171-53/+75
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Minor improvements to whatlog generation in Symbian tools2 builds. Fix linux-symbian cross-compilation configure-phase for platform builing
| * Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-141-53/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building Symbian platform itself, the lower layer libraries are not available on configure phase, and the config.test build scripts fail, creating false "NO"-flags (also config.test currently does not work with Symbian raptor). This fix aligns the configure results of configure-sh- script with configure.exe as far as possible and fixes couple of symbian cross-compilation configure issues, as detailed below: Configure sh-script: - Disable configure tests with symbian-sbsv2 where the failing test would result to invalid disable-flags - Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that are not produced by configure.exe either - Fix emitting of "QT_NO_GUI" flag (in all environments) qtconfigure.flm: - Copy mkspecs as files to /epoc32/... instead of symbolic link Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* | Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.Rolland Dudemaine2011-11-151-7/+54
|/ | | | | | | | | | | | Defaults are set for QT_INSTALL paths, and for various CFG_ defines. Also set the input and framebuffer drivers to be used. Also set the BUILD_PARTS to the reduced set that produce target code. If using script and declarative, then these are added still. Make the configuration explicitly "Qt for INTEGRITY". Since *_DIR variables are set in the first part of the configuration, do not set them again in the generic code. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-311-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: don't crash when destroying the shortcuts Disable activeqt on win32-g++ (it doesn't build). fix warning remove unused functions Make the DBus timeout configurable in QDBusAbstractInterface. Fix a typo in qt-conf docs. Revert "Fix build with the Clang compiler" Added missing no_include_pwd check Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)' Fix build with the Clang compiler Change spacing of title in offline style. Add support for rawFonts loaded from data in FaceId examples: fix compilation with namespaced Qt. Russian translation update Update Japanese translations for Qt 4.8. directfb: Include directfbgl.h directly tests: fix QNetworkProxyFactory test don't detach until the list is going to be modified optimize QList::removeAll()
| * Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-0/+4
| | | | | | | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-261-0/+4
|/ | | | | | | | | | | Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config.
* Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-231-0/+13
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-221-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: trivial: fix typo in comment changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access use RoundRobin scheduler by default on QNX a major refactoring of the mkspecs tree for QNX buildfix for qmake
| | * add a configure-time check for an IPC supportRitt Konstantin2011-06-211-0/+13
| | | | | | | | | | | | | | | Merge-request: 1259 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-221-3/+3
|\ \ \ | |/ /
| * | Adding arm armv6 and armv7 as valid archs for mac buildsIan2011-06-201-2/+2
| |/ | | | | | | Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix for QTBUG-18947. Changed the macosx deployment target to 10.5Simo Fält2011-06-071-1/+1
| | | | | | | | Reviewed by: Eckhart Köppen
* | Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-301-1/+1
|/ | | | Reviewed-by: Andreas Kling
* Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Olivier Goffart2011-05-161-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qt_s60_p.h
| * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-111-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_p.h src/gui/painting/qgraphicssystem_p.h src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/phononu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtTestu.def
| | * | Don't run XLib check if -no-gui is usedBernhard Rosenkraenzer2011-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, an attempt to compile Qt even with -no-gui on a Linux box that doesn't have libX11 installed fails becaue of the XLib functionality check in configure. This check can be turned off in -no-gui mode, since QtCore, QtXml, QtNetwork and friends don't use libX11. Merge-request: 1214 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |_|/ |/| | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Fix GLES2 include path for applications when not using the dash shellPaul Olav Tvete2011-05-111-1/+1
|/ / | | | | | | | | | | Backslash escapes normally requires "-e" option to echo Reviewed-by: Jørgen
* | Merge earth-team into origin/4.8Olivier Goffart2011-05-031-5/+18
|\ \ | | | | | | | | | | | | Conflicts: configure
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-281-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (31 commits) Make QtQuick2 compile on QPA Use maximum ascent/descent/leading from fallback fonts in shaping Another ugly hack to make bidi cursor work with Core Text Make sure layoutData exist before checking for string direction Removed warning from QPixmap::handle(). Take leading space width into account for painting and selection doc: Simplify language in QGlyphs docs doc: Minor cleanup in QGlyphs docs Remove extra comma at the end of enum list Fix compilation with Qt3Support Don't transform glyph positions for Core Graphics paint engine Skip linearGradientSymmetry test on QWS. Turn on HarfBuzz support for Mac/Cocoa Support visual cursor movement for BIDI text Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac Revert "Switch the default graphics system to raster on Mac." Fix an race condition in the auto test. Made linearGradientSymmetry test pass on qreal=float platforms. Make sure #ifdef'd tests still have main() function Long live QRawFont! ...
| | * \ Merge remote branch 'qt-mainline/master'aavit2011-04-261-49/+101
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| | * | | Turn on HarfBuzz support for Mac/CocoaJiang Jiang2011-04-191-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to enable HarfBuzz text layout on Mac by either: - Set QT_ENABLE_HARFBUZZ environment variable when running a Qt app. - configure with -harfbuzz to build Qt, then HarfBuzz support will be turned on by default. HarfBuzz will only be used when the font explicitly requested is supported by HarfBuzz (aka. TrueType/OpenType font), other fonts (AAT fonts) will still be handled by Core Text. Using HarfBuzz for text layout will hopefully solve most tricky complex text shaping bugs on Mac. Task-number: QTBUG-17728 Reviewed-by: Eskil
| * | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-201-4/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits) Fix compilation with symbian-armcc Updated Russian translation Ukrainian translation updated Fix wrong merge of 3aa39b0164ce4bb9e Symbol table is very limited in numeric input mode Fix build of Qt/DirectFB without graphics view support. Add new QSysInfo::symbianVersion() enums QDesktopServices::openUrl() doesn't handle URL encodings correctly Build fix for transition effect support on S60 5.0. Make EGL surface transparency working on Symbian. QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Splitview flag should also be updated to inputcontext QGraphicsView with vertical scrollbar flickers when splitview opens Splitview: opening a context menu should not re-position of focusItem Trigger fullscreen transition effects properly on app exit. ...
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-4/+3
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-131-4/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Have the backing store destroyed also in special Symbian scenarios. Use FixNativeOrientation on Symbian when the application wants it. QS60Style: itemview item with checkbox and text is drawn incorrectly Revert "Have the backing store destroyed also in special Symbian scenarios." Add focus frame support in style sheet Two QListView autotests do not pass on Symbian^3 releases tst_QStyle::drawItemPixmap test case fails on Symbian^3 Add the auto detection for OpenVG in configure Add focus frame support in stylesheet Make QS60Style to support new Tab graphics in new Symbian releases GraphicsView is not reset if focusItem is not set when keyboard closes Check the validity of qt_desktopWidget before dereferencing Labels are not visible in dialogs with all themes (part2) Labels are not visible in dialogs with all themes Enable webkit for symbian-gcce in configure Enable webkit build for the makefile build system with gcce Add the rules for gcce in do_not_build_as_thumb.prf Correct some parameters for the makefile build sytem, armcc and gcce Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system Do not unnecessarily draw application twice in landscape ...
| | | | * | Add the auto detection for OpenVG in configureLiang Qi2011-04-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18647 Reviewed-by: axis
| | | | * | Enable webkit for symbian-gcce in configureLiang Qi2011-04-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
* | | | | | Update configure to enable QtConcurrent for SymbianLiang Qi2011-05-021-3/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'earth-team/master' into earth-staging-masterOlivier Goffart2011-04-201-7/+35
|\ \ \ \ \
| * | | | | Added support for libICU for collation and toLower/toUpper.Denis Dzyubenko2011-04-121-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses icu to do string collation via QString::localeAwareCompare function and for QString::toLower/toUpper - which is important e.g. for turkish locales where uppercased 'i' is not a latin 'I'. Based on the patch by Harald Fernengel Reviewed-by: Harald Fernengel Reviewed-by: Zeno Albisser
| * | | | | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-121-6/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def
| | * \ \ \ \ Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-111-13/+29
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbian-socket-engine Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | * \ \ \ \ \ Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-251-10/+49
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| | * \ \ \ \ \ \ Merge branch 'symbian-socket-engine' of ↵Shane Kearns2011-03-081-6/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine Conflicts: src/network/access/qnetworkaccessmanager.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| | | * \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-071-81/+77
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp src/network/bearer/qnetworksession.cpp src/network/kernel/qnetworkproxy_symbian.cpp src/network/socket/qnativesocketengine_unix.cpp tests/auto/platformsocketengine/tst_platformsocketengine.cpp
| | | * \ \ \ \ \ \ \ Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-151-21/+65
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Symbian: Enable IPv6 again.Markus Goetz2010-12-081-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native QSymbianSocketEngine supports IPv6 just fine. This reverts commit 0c7d5d106152924dedd822da8c90d9f3247a9947.
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-181-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) Use s/static/Q_GLOBAL_STATIC/g in QScroller Alternative fix to the strict-aliasing violation warnings Revert "Fix strict-alias breaking warnings with GCC." Fix warning about vSize not being used in this function Do not try to test UnixFDs with the system API because it may be too old L10n: German translations for Qt 4.8 Compile with namespace support. Replace the handcoded math and change the timer buckets again. Move the constants up, preparing for refactoring Fix strict-alias breaking warnings with GCC. Fix compilation if D-Bus 1.4 isn't present. Change the number of entries in the first timer bucket. Change the error message in the timer ID deallocator. Add a benchmark for testing our QtDBus type-validation Move the QDBusPerformance test to the tests/benchmark dir Use the Qt code for validating types in QtDBus Add routines to validate D-Bus signature in QtDBus Remove the unused QDBusUnixFileDescriptor::isShared function Doc: document the QDBusUnixFileDescriptor class Autotest: really ensure that two fds are equal ...
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into HEADThiago Macieira2011-04-171-37/+53
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master'Oswald Buddenhagen2011-04-141-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Disable the JavaScriptCore JIT in ICC.Thiago Macieira2011-04-131-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of ICC 12.0.2, ICC is known to miscompile some "fastcall" code, which causes runtime crashes. This fault has been reported to Intel and a fix is being prepared. Reviewed-by: Olivier Goffart
* | | | | | | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: Fix build for Apple gcc Add platformNativeInterface assessor to QApplication Lighthouse: Add dummy QSessionManager Adapt to different uikit resolutions. Lighthouse: Make directfb conform with ligthhouse gl context api Compile fix for window surface features. (uikit)
generated by cgit v0.12 at 2024-11-11 11:36:59 (GMT)