summaryrefslogtreecommitdiffstats
path: root/projects.pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove docs and translations generation for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
| | | | | | | The source should only be used to build target code, in the context of building for INTEGRITY. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-171-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| * Fix make confcleanAnders Bakken2011-05-131-4/+4
| | | | | | | | | | Merge-request: 1227 Reviewed-by: ossi
* | absorb translations.pri into translations.proOswald Buddenhagen2011-03-311-6/+2
|/ | | | | this moves the various ts targets into the translations/ directory. creator and mobility already employ this scheme.
* installation of translations is now dealt with by translations.proOswald Buddenhagen2011-01-171-5/+0
| | | | Reviewed-by: mariusSO
* let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-1/+3
| | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* escape backslashesOswald Buddenhagen2010-05-261-18/+18
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * fix install of default mkspec from shadow build under windowsOswald Buddenhagen2010-05-121-0/+4
| | | | | | | | | | | | Patch-by: Lincoln Ramsay Reviewed-by: joerg Task-number: QTBUG-10619
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-2/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * | Fixed the host detection in qmake profiles.axis2010-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | The previous tests were checking the target platform, but we need to check the host. RevBy: Trust me
| * | Merge branch 'merge-request-1601' into master-s60axis2010-01-051-2/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: bin/createpackage.pl mkspecs/features/symbian/application_icon.prf qmake/generators/symbian/symmake_abld.cpp src/gui/text/qfontdatabase_s60.cpp src/s60main/s60main.pro
| | * Linux support for platform specific commands in .pro files.Anderson Lizardo2009-10-281-2/+13
| | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
* | | Re-anable building of lrelease and fix the translations dir to 'compile'Thomas Zander2010-02-041-1/+1
|/ / | | | | | | | | | | | | If we want translations to work, we need lrelease, so that should not be disabled anymore for symbian. Work around the hack of translations/translations.pro to not link anything so we don't do post-linking on symbian (which failed).
* | fix -nomake tools configure option for Windows CE / SymbianJoerg Bornemann2009-12-071-1/+1
| | | | | | | | | | | | | | lrelease must not be added to the subdirs project projects.pro when building Qt for Windows CE or Symbian. Reviewed-by: ossi
* | make qm file creation a regular build stepOswald Buddenhagen2009-11-101-1/+6
| | | | | | | | | | | | | | | | | | this is mostly a revert of the revert of the previous attempt, only that this time we have a bootstrapped lrelease which won't blow up for cross-compilations. Reviewed-By: Jason McDonald Task-Id: QTBUG-4939
* | Corrected QT_BUILD_PARTS handling for Symbian in projects.pro.Miikka Heikkinen2009-10-161-5/+5
|/ | | | | | | | Changed QT_BUILD_PARTS to be set in projects.pro only when it's empty also in Symbian, since configure now correctly sets it in .qmake.cache. Task-number: QT-1018 Reviewed-by: Janne Koskinen
* Remove last vestiges of the qtusagereporter.Jason McDonald2009-08-241-5/+0
| | | | Reviewed-by: Trust Me
* Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-271-1/+1
|
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-4/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-6/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | * revert built-time qm generationOswald Buddenhagen2009-06-161-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-1/+7
| |\ \ | | |/
| | * fix qm buildOswald Buddenhagen2009-06-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so "qmake -r && make" worked fine ... but configure does not simply run "qmake -r". also, now we have to build lrelease even when we don't build the other tools. Reviewed-by: Jason McDonald Reviewed-by: mariusSO
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * turn qm generation into a build time targetOswald Buddenhagen2009-06-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | consequently, remove the qm files from the repository this uses some really black magic to convince qmake to do the right thing. this will be fixed properly in a later version. Reviewed-by: mariusSO
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+142
| |
| * Adds support for linking against iodbc on linux.Bill King2009-05-281-0/+1
| | | | | | | | | | | | If unixodbc detection fails, try and link/detect iodbc libraries and link against them. Reviewed-by: Lincoln Ramsay
| * Long live Qt!Lars Knoll2009-03-231-0/+142
|
* Long live Qt for S60!axis2009-04-241-0/+159
generated by cgit v0.12 at 2024-12-29 03:18:20 (GMT)