summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Add ANGLE as a 3rdparty library to Qt.Jason Barron2012-10-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | ANGLE is a component that implements the OpenGL ES 2.0 API on top of DirectX 9. See the following for more info: http://code.google.com/p/angleproject/ ANGLE is now the default configuration on Windows. If you want to use desktop OpenGL, you should build Qt with the following configure options: -opengl desktop To configure Qt to use another OpenGL ES 2 implementation, you should use: -opengl es2 -no-angle Task-number: QTBUG-24207 Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* src.pro: remove redundant & incorrect platformsupport dependencyJ-P Nurmi2012-08-251-1/+1
| | | | | | | it's already added conditionally below Change-Id: I4df89b2822a3e6e46d8254c08fd69d0c98e680b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* enable platformsupport for -no-widgetsTasuku Suzuki2012-07-041-4/+4
| | | | | | | qpa plugins need platformsupport Change-Id: I6ebfac327940c00e1ab591045cf1a3bb3ac689e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't compile the host tools for wince already in configureOswald Buddenhagen2012-06-271-5/+2
| | | | | | | | qmake can now produce proper mixed-target projects Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* rewrite SUBDIRS construction logicOswald Buddenhagen2012-06-191-47/+68
| | | | | | | | | clearer and gets the conditional dependencies right Change-Id: Ifb24a4a84caffb0e3b45af7eb8cb21f5c5861d54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* detach src/src.pro and src/tools/tools.pro from qtbase.proOswald Buddenhagen2012-06-191-12/+6
| | | | | | | | | they were included instead of being proper subdirs. this doesn't appear to be necessary for anything at this point. Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove convoluted recursive debug/release target magicOswald Buddenhagen2012-06-191-40/+0
| | | | | | | | this has been a) dysfunct and b) unnecessary for *quite* a while. Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Change-Id: I5d658a15d0c1dc923002f8d773eecb8382cd213d
* Remove widgets lib dependency on platformsupport.Frederik Gladhorn2012-06-081-1/+1
| | | | | | | | Instead of the dependency add the one needed function as virtual to the QPlatformServices in QtGui. Change-Id: Ia4455f5ac88ec4d0480bd81635cebba62bbd8ac5 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Enable Gtk file iconsFrederik Gladhorn2012-05-151-2/+2
| | | | | | | | This needs some build system fixes to let widgets depend on the platform support library (and be built after it). Change-Id: I6f5b878971d1002a18e2fd66db4f34ffd0ac939a Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Reintroduce testlib to widget free buildsDonald Carr2012-04-171-1/+1
| | | | | | | | | | testlib now compiles without widget support and it will be great to get this code path QAed and testable. Change-Id: Iceb641bf04fdac84ef0a0f86d0abb83f4c66bf80 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add Qt Widgets opt out support to build systemDonald Carr2012-03-151-0/+1
| | | | | | | | | There should be a clear QWidget free path for people with no interest in legacy QWidget functionality. Adding this option to configure makes this path readily accessible and hence testable. Change-Id: If87c1063fcf4c46f5280836126c11999feaa9f8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up src.proDonald Carr2012-03-121-7/+1
| | | | | | | Removing (some) stale assumptions about dependencies from src.pro file Change-Id: I713e3ad8c164321ef035e6c62b25e18e45d1d3ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREEOswald Buddenhagen2012-03-081-14/+14
| | | | | Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* don't abuse $$fromfile() for inspecting entire projectsOswald Buddenhagen2012-02-291-2/+2
| | | | | | | | | | a project can rightfully expect a sane environment. $$fromfile() does not necessarily provide that. so instead use include() with a target namespace. Change-Id: I8d6d30ab1b760d4930c9b4453bc92f8f8ad0b0ae Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove over-uses of $$list()Oswald Buddenhagen2012-02-271-2/+2
| | | | | | | not sure why anyone would do *that* ... Change-Id: Id91e9e8bd602a9d9275ade2ca86aaa4f4698ff72 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Dont build printer support for Windows CE.Andreas Holzammer2012-02-101-3/+6
| | | | | | | | | Windows CE has no printing support, so we can disable this. Change-Id: I0ec83dff2d045de56d613cd676e9eb290145bf41 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Move QtConcurrent into its own moduleLars Knoll2012-02-051-0/+4
| | | | | | | Task-number: QTBUG-20892 Change-Id: I614500aafb6428915509983608bbb0ade4e4f016 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dependency of QtDBus onto QtXmlHarald Fernengel2012-01-221-1/+1
| | | | | | | | | Replace the QDom based code in qdbusxmlparser with code using QXmlStreamReader. Task-number: QTBUG-20856 Change-Id: I294e3ebd6faa813c20806be3ae225ac00befb622 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QtV8 library from QtBaseSimon Hausmann2012-01-091-4/+0
| | | | | | | | | | The QtV8 library is going to live in the qtjsbackend module. Change-Id: I72251316163829411dda998b9503ce6f75b3606a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Unbreak cross-compilation to ARM.Sergio Ahumada2012-01-011-1/+1
| | | | | | | v8snapshot is not required to build V8 Change-Id: I75f728a1237acaac9d3a10a87673fb2b6dd2dc91 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Executing 'make install' did not build mkv8snapshotJyri Tahtela2011-12-061-0/+1
| | | | | | | | | During shadow-building it was noticed that executing make install did not actually build mkv8snapshot and therefore caused an error. Change-Id: I126cdbaffb85170e25412b93bc99af79ac6f4642 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove S60/symbian specific codeLars Knoll2011-10-291-12/+3
| | | | | | | | Clean up and remove Symbian specific code and data. Change-Id: I89976fd087d485e04d37eccd3aeb3d2beac59b0a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Correct dependencies for the platformsupport libraryLars Knoll2011-10-281-0/+1
| | | | | | | | | Without this make -jx would often fail as some of the dependencies of the platformsupport lib weren't built yet. Change-Id: I1e4fea5fa6f0dd5751b6b53458f1f14bfeb225b2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove stuff related to obsolete platformsLars Knoll2011-10-281-14/+0
| | | | | | | Qt/Embedded and Symbian are no longer supported. Change-Id: Ifb86a384c666f389a166efe798d4792115731adb Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QtBase: Move idc to Active Qt.Friedemann Kleint2011-10-101-6/+1
| | | | | | | | | Remove include path to Active Qt from qt.prf. Change-Id: I476152ce56e47b573f5c835ec1347e772c4e9c3e Reviewed-on: http://codereview.qt-project.org/6355 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-131-4/+1
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge remote branch 'gerrit/master' into HEADSamuel Rødal2011-09-061-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Don't build v8 when -no-v8 is passed to configureKent Hansen2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | When v8 is enabled, QT_CONFIG contains "v8". There is no "no-v8", meaning that v8 was built regardless. Change-Id: I66740b23e5f7cae80740576ea0f13c3ad2f9ad40 Reviewed-on: http://codereview.qt.nokia.com/4073 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-301-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
| * Add QtV8 library to QtBaseKent Hansen2011-08-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds Aaron's copy of V8 to src/3rdparty/v8 (as a git submodule), and builds it as a "normal" Qt library (without any dependencies on Qt itself). The library can be added to a project with QT += v8-private V8 API headers are available as private includes, e.g. #include <private/v8.h> The API is private because we're exposing a third-party API directly, and we don't want to (and cannot) make source or binary compatibility guarantees for it. Since we want the V8 public API headers to be private headers in Qt, syncqt and sync.profile were extended to understand a new configuration option, the @allmoduleheadersprivate array, that tells syncqt whether all the library headers should be treated as private even though they don't follow the _p.h Qt convention. The V8 project files, patches and autotests are copied from the QtDeclarative repository. The next step after this commit is to remove QtDeclarative's copy of V8 and link with QtV8 instead. Task-number: QTBUG-20963 Change-Id: Ib8820362cdbc8fa662a5e97db841656cf38d1b62 Reviewed-on: http://codereview.qt.nokia.com/3092 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Fix build.Friedemann Kleint2011-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | - Introduced EXPORT definition for new QPrintSupport library. - Fixed dependencies in src.pro - Fixed some includes. Change-Id: I9863233ca2767928b37cf3fd1fdec31351b5da6b Reviewed-on: http://codereview.qt.nokia.com/3253 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Move printing into it's own libraryLars Knoll2011-08-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Create a libQtPrintSupport library that contains our current printing infrastructure. Long term this will get replaced with a libQtPrint, as the current architecture is not really maintainable. Change-Id: I7362fff6786b58c5b4e9213c23eda36d15048aa2 Reviewed-on: http://codereview.qt.nokia.com/3209 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | QtPlatformSupport: A helper library for platform pluginsJørgen Lind2011-06-101-1/+5
| | | | | | | | | | | | | | | | QtPlatformSupport is a static library. Platform plugins are meant to link against this library to pull in dependencies such as fontengines and convenience functions for finding the right GL configs. The linker will only pull in the symbols used, so the size of the library doesn't really matter
* | Remove OpenVG from qtbase.Friedemann Kleint2011-05-261-4/+0
| | | | | | | | Acked-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Fix build from scratch on Windows.Friedemann Kleint2011-05-241-1/+6
| | | | | | | | idc needs corelib (should be moved to ActiveQt later).
* | Build from scratch, use correct version number in Widgets.Friedemann Kleint2011-05-241-9/+4
| | | | | | | | | | | | | | Order in src.pro needs to be correct since qtbase.pro forces ordered. Acked-by: Samuel Rødal <sroedal@trolltech.com>
* | src.pro: Add dependencies of widget moduleFriedemann Kleint2011-05-231-2/+5
| |
* | build fixesLars Knoll2011-05-081-3/+3
| |
* | library splitLars Knoll2011-05-071-1/+4
|/
* Move uitools from QtTools to QtBaseLiang Qi2011-04-271-1/+4
|
* Move QtSvg into a separate repositoryLiang Qi2011-04-271-8/+1
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-72/+3
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+208
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12