summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* don't attempt to build host tools which are gone from qtbaseOswald Buddenhagen2012-02-201-8/+1
| | | | | | Change-Id: If9a3fb9792fc5d90496ff834b2c3adc177e1311e Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* bootstrap configure.exe on windowsOswald Buddenhagen2012-02-163-7/+264
| | | | | | | | | it is *ugly* to have the binary in the repository. this adds a few seconds to the windows build, as the configure needs to be rebuilt, obviously. that's almost negligible. Change-Id: I40ffde23b3c3af2b6bab3e78cd0a9f433214b563 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* compile without rttiOswald Buddenhagen2012-02-091-1/+1
| | | | | | | no point in it Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove pointless include pathsOswald Buddenhagen2012-02-091-6/+0
| | | | | | | we rely on a syncqt'd tree anyway Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* properly enable stl via qmake instead of hacking compiler flagsOswald Buddenhagen2012-02-091-2/+1
| | | | | Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build with QT_NO_GEOM_VARIANTOswald Buddenhagen2012-02-091-5/+1
| | | | | | | saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add missing errno.h includeOswald Buddenhagen2012-02-091-0/+1
| | | | | | | it was masked by the precompiled header Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove bizarre magic from precompiled headerOswald Buddenhagen2012-02-091-24/+1
| | | | | | | it doesn't serve any puropse (any more?) and it breaks the mingw build. Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Allow customization of qDebug output at runtimeKai Koehne2012-02-091-0/+2
| | | | | | | | | | | | | Check the QT_OUTPUT_PATTERN environment variable in the default message handler to customize the output of messages. Following place holders are right now supported: %{message}, %{type}, %{file}, %{line}, %{function} The original cleanupFuncinfo was written by Thiago Macieira. Change-Id: I6ad25baaa0e6a1c9f886105d2a93ef3310e512a9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: David Faure <faure@kde.org>
* Windows configure: make -mp affect the Qt build itselfJoerg Bornemann2012-02-011-3/+4
| | | | | | | | | | | Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I08b9ec762c59d2604635d73396044a74f717728c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Change syncqt default parameters for shadow buildingKalle Juhani Lehtonen2012-02-011-1/+2
| | | | | | | | | | | | | | | | | | | | For shadow builds configure creates syncqt script to shadow build directory tree calling the original syncqt from qtbase source tree. This wrapped script will add two default parameters when calling the original script. Both parameters are overridden in qtbase/mkspecs/features/default_pre.prf and are not needed except by configure script itself in latter stages where the parameter should be applied explicitly in shadow build condition branch. In addition, it adds the qtdir parameter for the forwarded syncqt call to indicate the location of qt sources for the syncqt. This also will give correct qmake path for qtmodule-configtests script triggered from syncqt. Changes are done both for Linux and Windows configure. Change-Id: I307b2e76c203ee14b849f10ff629f9668da2f223 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moving tiff image format support and libtiff out of qtbaseaavit2012-01-311-37/+4
| | | | | | | | | | The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove dead code from the configuresOswald Buddenhagen2012-01-301-198/+12
| | | | | | | | | | | | | | | This removes the options to disable several modules, as they are in separate repositories now and can be "disabled" by simply not compiling them. Note that this leaves some configuration options for these separate modules in, as they have no own configures. This is ugly, but has to stay that way for the time being. Some other dead code had to go as well, just like accepting the obsolete -qdbus option. Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3010-10/+10
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add concurrent to QT_CONFIG also on WindowsSamuli Piippo2012-01-271-0/+2
| | | | | | | It was forgotten in 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I1ed9a60983f978d89615ae91c99f5c02ffe57f7c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QRegularExpression: configure support for PCREGiuseppe D'Angelo2012-01-261-2/+25
| | | | | | | | | Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix building of configure.exe.Friedemann Kleint2012-01-251-0/+2
| | | | | | | Add missing files to profile. Change-Id: I72ccbbbef3e036fc0cfe7a0a6df4c19d0474b798 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-251-36/+2
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-2310-10/+10
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QDir::convertSeparators()Lars Knoll2012-01-191-2/+2
| | | | | | | | | This method has been deprecated since Qt 4.2. QDir::toNativeSeparators() replaces it since then. Change-Id: I49e6e1bfd50f26aa30134e599ee82067709549a7 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Don't use check as an identifier in the configure app.Stephen Kelly2012-01-101-2/+2
| | | | | | | Avoids conflict with macro on Mac OS. Change-Id: I3426c2dc514240d80996d823b7a552c13a09f99e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a new QT_NO_SSL feature macro.Richard Moore2012-01-061-1/+4
| | | | | | | | | | | | | | | | | At the moment users of Qt must detect if it was compiled with SSL support by testing for QT_NO_OPENSSL. This means that any code that is conditionally compiled this way is tied to the presence of the openssl backend. This commit makes it possible to implement new SSL backends during the Qt5 lifetime without breaking this code. People can still test for QT_NO_OPENSSL if they really need openssl, but if they simply want to know if there's SSL support at all they should use this define instead. In addition, this commit changes the public API headers to use the new define. Change-Id: Ib57a71aa65836ac9351f120a487bfeb8009d9515 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0510-10/+10
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* configure: Remove -nokia-developer optionKai Koehne2012-01-041-11/+2
| | | | | | | | | | There's no good reason to still differentiate between 'Nokia' developers, and Qt developers outside of Nokia, inside configure. Just use -developer-build -opensource -confirm-license. Change-Id: I8726947dae0c70412eb52bf9d88eda4aa061ef26 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Finish removing Qt3 supportBradley T. Hughes2011-12-231-13/+1
| | | | | | | | | | | | | | | | Remove the (-no)-qt3support options from configure, and remove the last remaining references to Qt3Support, QT3_SUPPORT, and QEvent::ChildInserted. The compatibilityChildInsertEvents() tests in tst_QObject and tst_QWidget have been renamed to childEvents(), which is a more appropriate name. Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* configure[.exe]: use create_prl, link_prl for all modulesRohan McGovern2011-12-211-2/+4
| | | | | | | | | | | | These should go into qmodule.pri, rather than .qmake.cache, as they make sense for all Qt modules - not only qtbase. Fixes link failure when building qtdeclarative with jom on Windows. Change-Id: I3e8b207e1808cb23af58b865a160c2fafa906288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove -graphicssystem (and -runtimegraphicssystem) options from configure.Robin Burchell2011-12-141-34/+0
| | | | | | | | | | In a Qt 5 world, these have no relevance, so remove them. Task-number: QTBUG-23022 Change-Id: I2f52c7aa1fcb8234046dd95b4d702791d20514fa Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* configure.exe: Build tests by default.Friedemann Kleint2011-11-291-1/+1
| | | | | | | As does configure[.sh]. Change-Id: I5561d83a0c3959d6ae1efa5231cf2a149ad28377 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Added build system support for installing tests.Rohan McGovern2011-11-231-0/+13
| | | | | | | | | | | | | Tests will install under $$[QT_INSTALL_TESTS]. TESTDATA may be used to install additional testdata required by the test. The default install rule may be disabled by CONFIG+=no_testcase_installs. Change-Id: I204de60c8e844775906ffd016ca50bffbb414142 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add V8 snapshot supportKent Hansen2011-11-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | A V8 snapshot is a serialized representation of the JavaScript heap. Using a snapshot can vastly speed up V8 initialization. This commit introduces a new tool, mkv8snapshot. mkv8snapshot is automatically invoked as part of building QtV8, and generates a .cpp file which is compiled into the QtV8 library. Because mkv8snapshot itself needs to initialize the V8 environment the non-snapshot way (i.e., by evaluating thousands of lines of JavaScript), it needs to build all of V8. This means that V8 is effectively built twice when snapshots are enabled. When cross-compiling, only host=i386 and target=arm is supported, since that's the only relevant case for which V8 currently supports a simulator. mkv8snapshot is built and run as a host tool (using the simulator), and generates a snapshot that will be used on the target. Task-number: QTBUG-21152 Change-Id: I9270652f129505508f78db8b0a39fbf57dc8b86d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* configure.exe: Reduce size by using -O1 instead of -O2.Friedemann Kleint2011-11-181-2/+4
| | | | | Change-Id: Ica4d19364415180411cd74df7c3fb92d0100bfba Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Windows: Add -force-asserts to configure.exeFriedemann Kleint2011-11-171-1/+7
| | | | | Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* symbian epoc root code removedJoerg Bornemann2011-11-073-321/+0
| | | | | | | Change-Id: Ibc9f5e42c534a09a8a44a0c95789f467970d38a2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* remove symbian support from configureJoerg Bornemann2011-11-075-275/+30
| | | | | Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move a11y inspector from tools to util.Morten Sorvig2011-10-2012-1497/+0
| | | | | Change-Id: Ifc032c511aea72a8f7a4ec62d304e89718f712db Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: Add initial accessibility implementation.Morten Sorvig2011-10-1912-0/+1497
| | | | | | | | | | | | | | See qcocoaaccessiblity.h for details. For now only the first level of the hierarchy is made accessible. Also add tools/accessibilityinspector which is an utility for inspecting and debugging the Qt accessibility tree. Change-Id: Iff520bec26b3761feb0c2e00471feb379daaa735 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Use freetype font engine on WindowsOlli Werwolff2011-10-101-1/+1
| | | | | | | | | | | | | | | As windows' fontdatabases also uses functionalities from qbasicunixfontdatabase it was renamed to qbasicfontdatabase. But instead of iterating over the font directories' files it uses system calls to obtain the list of fonts and uses registry values to find the according filenames to add. The native font engine was still kept. It can be activated by adding fontengine=native as platformargument. Change-Id: I7197bed5d18b8a33d4aa97ce91bfa1cd281b80ea Reviewed-on: http://codereview.qt-project.org/5839 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Sanity-Review: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Windows/configure.exe: Build V8 by default.Friedemann Kleint2011-10-041-1/+1
| | | | | | | Change-Id: I01f31f683fcac322c2a8bec313a48057939ebeb0 Reviewed-on: http://codereview.qt-project.org/5809 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Ensure build_all is propagated to all modules when appropriate.Rohan McGovern2011-09-151-1/+1
| | | | | | | | | | | | If qtbase was configured to build both debug and release versions of libraries, it makes sense for any modules we are building to do the same by default. Change-Id: Idb5f78a7414b6ed2bacf295ad01f259fca435410 Reviewed-on: http://codereview.qt-project.org/4702 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-1325-20160/+0
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge branch 'refactor'Gunnar Sletta2011-09-1311-48/+17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * Merge branch 'master' into refactorGunnar Sletta2011-09-121-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/gui/text/qfont_qpa.cpp src/gui/widgets/qlinecontrol.cpp src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp tests/auto/gui.pro tests/auto/network.pro tests/auto/qstring/tst_qstring.cpp Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
| * \ Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-061-57/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/global/qglobal.h src/gui/kernel/qplatformnativeinterface_qpa.h src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qmenu_mac.mm src/gui/widgets/qmenu_p.h src/gui/widgets/qmenubar.cpp src/gui/widgets/qmenubar_p.h src/gui/widgets/widgets.pri src/plugins/platforms/wayland/qwaylandnativeinterface.cpp src/plugins/platforms/wayland/qwaylandnativeinterface.h src/src.pro tests/auto/qdir/tst_qdir.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp tests/auto/qstring/tst_qstring.cpp Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
| * | | Compile fix.Samuel Rødal2011-09-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uilib includes QtGui and QtWidgets headers, so should explicitly add gui and widgets in the .pri file. Change-Id: I5f1e80d1379cb5389287df73d6070fd8ff712a3b Reviewed-on: http://codereview.qt.nokia.com/4055 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-301-6/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
| * \ \ \ Merge branch 'master' into refactorGunnar Sletta2011-08-253-3068/+617
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_qpa.cpp src/gui/kernel/qcursor_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.cpp src/gui/kernel/qwindowsysteminterface_qpa.h src/gui/kernel/qwindowsysteminterface_qpa_p.h src/gui/text/qtextcontrol.cpp src/plugins/platforms/wayland/wayland.pro src/widgets/accessible/qaccessible2.h src/widgets/widgets/qwidgetlinecontrol_p.h Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74
| * \ \ \ \ Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-031-0/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
| * \ \ \ \ \ Merge remote branch 'gerrit/master' into refactorLars Knoll2011-07-062-12/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/opengldesktop/opengldesktop.cpp examples/itemviews/interview/interview.pro examples/mainwindows/mainwindow/mainwindow.pro examples/openvg/README examples/richtext/textedit/textedit.pro examples/tools/undo/undo.pro src/corelib/global/qglobal.h src/corelib/kernel/qcoreapplication.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qmetatype.h src/gui/kernel/qevent.cpp src/gui/kernel/qevent.h src/gui/painting/qpaintengine_raster.cpp src/gui/painting/qpaintengine_raster_p.h src/gui/text/qfontdatabase.cpp src/opengl/qgl.h src/openvg/qpaintengine_vg.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp tests/auto/qmainwindow/qmainwindow.pro Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
| * \ \ \ \ \ \ Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-271-16/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
| * | | | | | | | configure.exe: Remove QT3_SUPPORT.Friedemann Kleint2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it is causing compile problems.
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 19:13:48 +0000