summaryrefslogtreecommitdiffstats
path: root/src/src.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fixed circular dependency warning.axis2010-08-031-0/+1
| | | | RevBy: Trust me
* Added a top-level runonphone target for Qt and QtWebKit.axis2010-07-021-0/+11
| | | | RevBy: Trust me
* 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
* 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
|/
* 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.
| * Fix the parallel build of QtWebKitSimon Hausmann2010-01-221-0/+1
| | | | | | | | | | | | | | Added the missing dependency to xmlpatterns, to ensure it's built before QtWebKit if available. Reviewed-by: Tom
* | Fixed makefile generation for Symbian.axis2010-01-141-3/+5
|/ | | | | | | | This enables fast makefiles as well as intermodule dependencies. This hasn't been tested with the other Symbian build systems. It's quite possible that they will break because of this, but we will handle that at a later time.
* Fix failing sub-src targetMarius Storm-Olsen2009-11-101-1/+1
| | | | | | | | | | | | sub-src was iterating over SRC_SUBDIRS and not SUBDIRS. So, when the tools were refactored out to handle distributed builds of host tools with Electric Cloud, these tools were not included in the iteration. Adding $$TOOLS_SUBDIRS to the recurse fixes this. Also avoid setting dependencies for non-ordered builds Reviewed-by: Jason McDonald
* Merge commit 'b65fd82299' from qt-core-team 4.6 into 4.6Marius Storm-Olsen2009-11-091-28/+5
|\ | | | | | | | | | | | | Conflicts: configure.exe src/corelib/io/qfsfileengine.cpp tests/auto/qfile/tst_qfile.cpp
| * Ensure IDC and UIC3 dependencies are correctMarius Storm-Olsen2009-11-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | After the refactoring to src/tools/tools.pro the dependencies for IDC and UIC3 ended up being incorrect, due to the eval rules later in that file. This patch adds IDC and UIC3 to SRC_SUBDIRS after Qt3Support, and before ActiveQt, so the dependencies remain correct as before the refactoring. The added condition of src/tools/tools.pro ensures that we add the tools to the Makefile in src/tools, should we decide to generate it, and compile from there. Reviewed-by: Jason McDonald
| * Add src/tools/tools.pro, and use when building host tools for xcompilingMarius Storm-Olsen2009-11-041-28/+3
| | | | | | | | | | | | | | | | | | Configure.exe would simply initiate a build for each of the tools in order. However, this would break certain distributed build systems, since they would return right away after initiating the make. Thus, sometimes moc et al. would try to link before bootstrap lib was built. Reviewed-by: Jason McDonald
* | Declarative building infrastructure.Warwick Allison2009-11-041-0/+5
|/ | | | Does nothing if no declarative directories installed.
* Fixed compile failure when running make with large -j.Rohan McGovern2009-09-281-0/+1
| | | | | | | | | | `ld: library not found for -lQtOpenGL' ... in opengl graphicssystem. Must build QtOpenGL before the GL graphicssystem plugin. Reviewed-by: brad
* Only depend on phonon when building webkit if phonon was configured forAndy Shaw2009-09-071-1/+2
| | | | Reviewed-by: Denis
* Added a phonon dependency to webkitDenis Dzyubenko2009-09-041-1/+1
| | | | | | We need to make sure phonon is built before webkit. Reviewed-by: Tor Arne
* Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-2/+3
| | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
* Merge commit 'qt/master'Jason Barron2009-08-211-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/examples.pro qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/qmake.pro src/script/api/qscriptable.h src/script/api/qscriptclasspropertyiterator.h src/script/api/qscriptcontext.h src/script/api/qscriptengineagent.cpp src/script/api/qscriptstring.cpp src/script/api/qscriptstring.h src/script/api/qscriptvalueiterator.cpp src/script/api/qscriptvalueiterator.h src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptvalue.cpp src/script/qscriptvalue_p.h src/script/qscriptvalueimplfwd_p.h src/script/script.pro src/src.pro tests/auto/auto.pro tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp tools/configure/configureapp.cpp
| * add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -script (default) and -no-script. This means we can get rid of the SCRIPT feature from qfeatures, since it's now handled by the new configure variable. It also allows us to get rid of all the QT_NO_SCRIPT ifdefs from the source files, since qmake isn't going to include those files for compilation when you configure with -no-script. The QtScriptTools module will be disabled if the QtScript module is not built. You'll have to build the old QtScript back-end (will be made available in a separate package), then build the QtScriptTools module yourself. Reviewed-by: Simon Hausmann
* | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| * Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+4
| |
* | Merge commit 'qt/master-stable'Jason Barron2009-08-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/openssl/openssl.pri demos/embedded/embedded.pro examples/itemviews/chart/chart.pro examples/network/network.pro examples/painting/painterpaths/painterpaths.pro examples/threads/mandelbrot/mandelbrot.pro qmake/project.cpp src/3rdparty/libtiff/libtiff/tif_config.h src/corelib/arch/arch.pri src/corelib/global/qglobal.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qcore_unix_p.h src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/corelib/tools/qsharedpointer_impl.h src/corelib/tools/tools.pri src/gui/kernel/qaction.h src/gui/kernel/qapplication.cpp src/gui/painting/qregion.h src/gui/widgets/qlineedit.cpp src/gui/widgets/qlineedit_p.h src/network/socket/qnativesocketengine_unix.cpp tests/auto/qdir/tst_qdir.cpp tests/auto/qdiriterator/tst_qdiriterator.cpp tests/auto/qhttp/qhttp.pro tests/auto/qline/qline.pro tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qresourceengine/qresourceengine.pro tests/auto/qsharedpointer/qsharedpointer.pro tests/auto/qstring/qstring.pro tests/auto/qtcpsocket/qtcpsocket.pro tests/auto/qtcpsocket/tst_qtcpsocket.cpp
| * Port of Qt to VxWorksRobert Griebl2009-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Qt work on VxWorks 6.6+ in native (kernel) mode. * compiles with the WindRiver GNU toolchain (Linux only) * works with QWS (tested with the VNC driver only) * tested on PPC hardware and the x86 VxWorks simulator * no q3support, no phonon, no webkit * no QSharedMemory, no QSystemSemaphore, no QProcess * only one QApplication instance (flat address space) * filesystem support depends heavily on the quality of the native driver * QLibrary is just a dummy to make plugins work at all * qmake transparently creates VxWorks munching rules for static ctors * made auto-test cope with missing OS features A special note regarding the Q_FOREACH patch for dcc: when calling foreach(a,c) with c being a function returning a container, the compiler would generate 5 references to some labels (.LXXXX), which are not there (so the linker complains in the end). Seems like dcc doesn't really like the 'true ? 0 : <function call to get type>' statement Reviewed-By: Harald Fernengel
* | Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * | Fix compilation on WinCE by using correct scopes.Jason Barron2009-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | A scope is not an else case unless it is explicitly preceded by the 'else' keyword. This was causing the 'symbian' block to be treated as a separate block and therefore WinCE was hitting the 'else' case which caused several subdirs to be added a second time.
* | | Remove some of the symbian workarounds from src.pro.Jason Barron2009-07-081-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we had a separate block of things to disable for Symbian OS, but that isn't really necessary since everything is protected by the QT_CONFIG variable. Most of these are disabled by default, but if someone wants to enable them, they can, but might not work. Reviewed-by: axis <qt-info@nokia.com>
generated by cgit v0.12 at 2024-11-27 11:47:36 (GMT)