summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-094-2/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed qmake "not found" error.axis2009-07-071-0/+0
| |
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * Support the -qtlibinfix parameter already on Unix/MacMarius Storm-Olsen2009-06-301-2/+2
| | | | | | | | | | | | | | | | | | The configuration option was not added to the Windows configure. Reviewed-by: hjk
| * | Merge branch 'warningRemovals'axis2009-07-061-0/+10
| |\ \
| | * | Started suppressing some rather pointless warnings from RVCT.axis2009-07-061-0/+10
| | | |
| * | | Added temporary include file generation to symbian-sbsv2 generatorMiikka Heikkinen2009-07-012-0/+27
| |/ / | | | | | | | | | and cleaned related functionality up a bit.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29103-205/+203
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | Move the EGL library to a different qmake variable.Jason Barron2009-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The EGL code is now a part of QtGui so QtOpenVG doesn't need to link against it anymore. This also removes the need to link against cone since we don't need to call DrawableWindow() from the OpenVG code. We add the EGL library to a separate variable which is then used when QT_CONFIG contains the "egl" feature.
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30107-205/+229
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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'Thiago Macieira2009-06-242-4/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: tests/auto/qsqldatabase/tst_databases.h
| | * | Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-232-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
| * | | Better detection for OpenVG engines that run on top of OpenGLRhys Weatherley2009-06-243-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags on the link line if it is needed by the OpenVG engine. Reviewed-by: trustme
| * | | Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-225-1/+14
| | | | | | | | | | | | | | | | | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
| * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16100-200/+200
| |\ \ \ | | |/ /
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16100-200/+200
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-254-89/+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/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * keep CONFIG+=silent working with the new translations.pro fileBradley T. Hughes2009-06-121-1/+1
| | |
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-6/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| * | Merge branch '4.5'Tom Cooksey2009-05-281-2/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/embedded/qkbdtty_qws.cpp
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-226-81/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| | * \ \ Merge branch '4.5'Thiago Macieira2009-05-144-5/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | * \ \ \ Merge branch '4.5'Thiago Macieira2009-05-113-9/+8
| | |\ \ \ \
| | * | | | | Change optimization flags from Os to O2 for OS X applications.Morten Sørvig2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt itself was O2 from 4.2 and up, this changes it for applications as well. Reviewed-by: nrc
| | * | | | | Merge branch '4.5'Thiago Macieira2009-04-201-4/+6
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-1/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| | * \ \ \ \ \ \ Merge commit 'origin/4.5'Olivier Goffart2009-04-151-23/+40
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * \ \ \ \ \ \ \ Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-073-0/+15
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| | * \ \ \ \ \ \ \ \ Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-022-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-2/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.5'Thiago Macieira2009-03-271-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| | * | | | | | | | | | | | | Long live Qt!Lars Knoll2009-03-23321-0/+18744
| | / / / / / / / / / / / /
| * | | | | | | | | | | | | kill experimental QtAnimation module stuff, the module doesn't exist anymoreKent Hansen2009-05-201-2/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-126-31/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | | | | | | | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-17321-0/+18818
| / / / / / / / / / / / /
* | | | | | | | | | | | | Remove extra bracket on stlportv5 detection.Jason Barron2009-06-161-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix detection of stlportv5.Jason Barron2009-06-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using two concatenated variables as an argument to exists() causes problems because this can expand to '//' which qmake thinks is a valid path (if at the beginning), but this is not what we want here. So add a work around to manually expand the path without the additional '/' character and then add a comment saying that changing one should change the other. Reviewed-by: Miikka Heikkinen
* | | | | | | | | | | | | More robust handling for stdapis pathsMiikka Heikkinen2009-06-123-19/+28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Make Qt exception safer.Robert Griebl2009-06-102-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | | | | | | | | | | | | Switched QDesktopServices mail-to URL handling to RSendAs in Symbian.Janne Anttila2009-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier used CSendUi required extensiva capabilities to work correctly, that's why "new email" option in desktop services example application did not work correctly with self signed capabilities. RSendAs requires lower capabilities since SendAs server (separate process) takes care of necessary actions to send the message.
* | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-082-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| * | | | | | | | | | | | Ensure that the manifest files are placed correctlyAndy Shaw2009-06-082-6/+10
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If OBJECTS_DIR was empty then it would create a directory for the manifest files in the root directory. This is not desired as it should create a directory in the build directory instead. Reviewed-by: Marius Storm-Olsen
* | | | | | | | | | | | Merge branch 'imSelections'axis2009-06-033-3/+93
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed incorrect headers.axis2009-06-033-3/+93
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| * | | | | | | | | | | | support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-281-2/+5
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes
* | | | | | | | | | | | Removed PAGED keyword from S60 3.1 buildsMiikka Heikkinen2009-05-291-0/+1
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Revert "Enable symbol visibility when compiling with RVCT."axis2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c33abd370470a0097cc1fbb858e1218ba110e0df. We will need this patch in the end, but right now it's causing too much trouble with the compiler. To return soon!