summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-171-1/+1
| | | | | | | | | | 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>
* Remove QT 3 API support by default for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
| | | | | Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
| | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make sure the declarative plugin of QtWebKit is build once.Alexis Menard2011-06-301-4/+0
| | | | | | | | In the old WebKit the main pro file was not triggering the build of the declarative plugin therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
* Make sure JavaScriptCore is build once.Alexis Menard2011-06-301-7/+0
| | | | | | | | In the old WebKit the main pro file was not triggering the build of JavaScriptCore therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
* Some qmake black magic to pick up the right file.Alexis Menard2011-06-031-1/+1
| | | | | | I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling
* Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-311-1/+1
| | | | | | | | by QtWebKit.pro. We should read that one instead. I also removed some files which should not be here. Reviewed by: Andreas Kling
* Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-301-6/+6
| | | | Reviewed-by: Andreas Kling
* Fix parallel buildsJoão Abecasis2011-02-171-0/+1
| | | | Reviewed-by: Kai Koehne
* Fixed a typo in src profile.axis2011-01-281-1/+1
| | | | RevBy: Trust me
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+4
|\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * Made javascriptcore depend on corelib.axis2010-10-041-1/+4
| | | | | | | | | | | | | | It lists "QT = core" in its profile, and may fail parallel builds if the dependency is not in place. RevBy: Benjamin Poulain
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-1/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
| | | | | | | | | | | | | | | | | | When configuring with -no-multimedia then the plugins rule should not be depending on multimedia, otherwise it will not try and build any plugins. Task-number: QTBUG-13912 Reviewed-by: Rohan McGovern
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-0/+1
|\ \ | |/
| * Fixed circular dependency warning.axis2010-08-031-0/+1
| | | | | | | | RevBy: Trust me
* | Only list activeqt oncePaul Olav Tvete2010-08-181-1/+0
| | | | | | | | | | This caused build errors for the Windows platform. Looks like a merge error introduced in commit 075e96eba50
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-07-141-0/+11
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/image/image.pri src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp
| * Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
| | | | | | | | RevBy: Trust me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-2/+6
|\ \ | |/
| * Build declarative before webkit.Alexis Menard2010-06-231-2/+2
| |
| * Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-181-0/+4
| | | | | | | | | | | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-20/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/qws.conf src/corelib/io/qresource.cpp src/gui/image/qpixmapdata_p.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/opengl/qgl_p.h src/plugins/mediaservices/gstreamer/gstreamer.pro
| * Fix recursive targets for src.proMiikka Heikkinen2010-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | Dependencies to tools moc, rcc and uic on some subdirs break recursive targets like 'make sis' for symbian-abld and symbian-sbsv2 builds. There is no need to have any subdir dependencies for above mkspecs as those builds are always ordered anyway. Task-number: QTBUG-5312 Reviewed-by: Janne Koskinen
| * fix escaping - by not using evalOswald Buddenhagen2010-05-271-8/+8
| | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-5/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| | * Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
| | | | | | | | | | | | | | | | | | QtXml is not required by QtSvg, QtWebKit or QtDeclarative. And QtDeclarative doesn't link to QtWebKit anymore (imports do). But it does link to QtOpenGL.
| * | Removed mediaservices.Kurt Korbatits2010-05-181-6/+1
| |/
* | Say hello to Qt for Native Client.Morten Johan Sørvig2010-05-141-0/+2
|/ | | | | | | | | | | | | | This commits adds build system to support for the native client compiler (x86-only for now), sets up global defines, and adds compile fixes for QtCore and QtGui. Details: * Add mkspecs for linux-nacl-g++ and macx-nacl-c++ * Add nacl configure option * Add qconfig-minimal-system-dependencies.h * Define Q_OS_NACL in qglobal.h * Add qnacalunimplemented.h/cpp with POSIX stubs. * .pro file changes for cross-compiling on Mac
* Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-221-1/+1
|\ | | | | | | | | Conflicts: demos/multimedia/player/player.pro
| * Build fix for mingwThierry Bastian2010-04-201-1/+1
| | | | | | | | | | | | | | | | This was preventing the activeQt tools to build Don't know exactly why though.... Task-number: 10003 Reviewed-by: Zeno Albisser
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-2/+6
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-131-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebKit: Fix the QWebHistory serialization auto-test Mark QWebFrame::overloadedSlots autotest as expected failure QtWebKit: Fix autotests .qrc file paths when built from tests/auto/qweb* QtWebKit: Build fix for WinCE. Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. Fix failing assertions in debug builds Fix the build of webkit examples on platforms without OpenGL and Multimedia QtWebKit: Fix build on mac. QtWebKit: Build fix for WinCE. QtWebKit: Fix build on WinCE, adding missing include path. QtWebKit: Change the dependency from phonon to QtMultimedia. QtWebKit: Add missing namespace wrapper temporarily until next import. QtWebKit: fix build with qws temporarily until next import. Update src/3rdparty/webkit from trunk. QtWebKit: Re-add the dependency to the static linked JavaScriptCore
| * QtWebKit: Change the dependency from phonon to QtMultimedia.Jocelyn Turcotte2010-04-071-2/+2
| | | | | | | | | | | | Added for both ordered and unordered builds. Reviewed-by: TrustMe
| * QtWebKit: Re-add the dependency to the static linked JavaScriptCoreJocelyn Turcotte2010-04-061-2/+2
| | | | | | | | Reviewed-by: Simon Hausmann
* | fix build from top levelOswald Buddenhagen2010-04-121-13/+6
| | | | | | | | | | | | | | | | even more fallout from MR 543. qt3support needs to be added after qtgui, as a build from top level is ordered, not dependency based. as i was at it, i cleaned up the platform conditionals some more. Reviewed-by: joerg
* | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-4/+5
|/ | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-1/+1
| | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* Make multimedia only depend on opengl when the latter is buildThomas Zander2010-03-191-1/+2
| | | | Reviewed-By: axis
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * Make QGLShaderProgram-dependency in QtMultimedia explicit in src.proTor Arne Vestbø2010-03-151-1/+1
| | | | | | | | | | | | QtOpenGL needs to be built before QtMultimedia to avoid link errors. Reviewed-by: Gunnar
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+6
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * Fix buildHarald Fernengel2010-03-081-1/+1
| | | | | | | | | | | | The dependency was wrong, should be src_webkit instead of webkit Reviewed-by: Tobias Hunger
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-041-2/+0
| |\ | | | | | | | | | | | | Conflicts: src/src.pro
| | * Remove dependency on declarative from multimedia.Justin McPherson2010-03-031-1/+0
| | | | | | | | | | | | | | | | | | Move all declarative related classes into the multimedia declarative module. Reviewed-by: Andrew den Exter
| * | Fix build of importsTobias Hunger2010-03-021-0/+6
| |/ | | | | | | | | | | * Fix export macro used in webkit * Fix dependencies on declarative/mutlimedia * Copy qmldir files into the build tree
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * Express dependencies for QtMultimedia.Justin McPherson2010-02-151-2/+3
| |
* | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
generated by cgit v0.12 at 2024-11-11 10:19:41 (GMT)