summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-041-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * Add the QMAKE_FILE_EXT variable to extra compilers generation.Jocelyn Turcotte2010-02-041-0/+13
| | | | | | | | | | | | | | | | This give the possibility to get the file name with the extension and without the path. Reviewed-by: Joao Reviewed-by: Marius Storm-Olsen
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-049-41/+87
|\ \ | |/ |/| | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-031-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed QFileInfo::absolutePath() warning when running "qmake -project" QTcpServer: Clarify thread affinity of incoming QTcpSocket Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events. Updated my changelog entry QNAM HTTP: Fix bug related to re-sending a request Adding my changes. Remove erroneous warning in QFileInfo::absolutePath()
| | * Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-7176 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-028-41/+46
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant examples: Fix missing QLatin1String. Added Czech translations. Webkit: Fix missing namespace. qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| | * qmake: subdirs template: make distclean target use QMAKE_DISTCLEANOswald Buddenhagen2010-02-011-0/+1
| | | | | | | | | | | | | | | | | | patch by David Faure Reviewed-by: mariusSO
| | * qmake: fix warningsOswald Buddenhagen2010-02-016-24/+27
| | | | | | | | | | | | | | | | | | missing braces, parens and spaces denoting empty loop bodies Reviewed-by: mariusSO
| | * qmake: Remove macro and simplify string expression previously using itOswald Buddenhagen2010-02-011-2/+3
| | | | | | | | | | | | | | | | | | also fixes a warning Reviewed-by: mariusSO
| | * qmake: use isActiveConfig() instead of hand-crafting comparisonsOswald Buddenhagen2010-02-013-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | ensures consistent handling of CONFIG values. this is incompatible with 4.6.1, as it removes case-insentitivity from some of the config keys, but those pro files wouldn't be portable beyond symbian anyway, and symbian compatibility guarantees start with 4.6.2. Reviewed-by: mariusSO
| * | Added support for ifdeffing for manufacturer in generated pkg filesMiikka Heikkinen2010-01-281-0/+40
| |/ | | | | | | | | | | | | | | | | | | | | | | DEPLOYMENT.manufacturers variable can be used to define manufacturer identifiers. DEPLOYMENT.manufacturers.fail_note variable can be used to define a file that contains the text to be shown in case of failed manufacturer check. Task-number: QTBUG-7695 Reviewed-by: Janne Koskinen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-224-23/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed the host detection in qmake profiles. Improving parts of commit 2d8d855d. qmake: add Linux host support to Symbian generator Fixed indentation. Add Linux host support to Symbian mkspecs. Linux support for platform specific commands in .pro files. Add createpackage.bat equivalent for Unix systems. Make all Symbian #includes lower case. mkspecs: fix warning when calling qmake Fix portability problems in bin/createpackage.pl.
| * \ Merge branch 'merge-request-1601' into master-s60axis2010-01-054-23/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Improving parts of commit 2d8d855d.axis2009-11-171-10/+20
| | | | | | | | | | | | | | | | | | | | It breaks Symbian on Windows, so instead use an approach that works on all platforms.
| | * | qmake: add Linux host support to Symbian generatorAnderson Lizardo2009-11-174-23/+53
| | | | | | | | | | | | | | | | Signed-off-by: axis <qt-info@nokia.com>
* | | | Merge branch '4.6'Thiago Macieira2010-01-215-10/+44
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-201-1/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
| | * | | Add command to qmake to do symbian-uid generationThomas Zander2010-01-201-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UID3 as required by symbian has to be auto-generated when the user doesn't supply one. To allow this to be done in a mkspec we need a function to do the hashing. This method adds that. Reviewed-By: Marius Storm-Olsen
| * | | | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-204-9/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous s60installs specific fix was flawed in that it failed to generate exports when doing clean build. Replaced that with a more generic solution that exports plugin stubs under \epoc32\data\z always. Task-number: QTBUG-6972 Reviewed-by: Janne Anttila
* | | | Merge branch '4.6'Thiago Macieira2010-01-181-8/+6
|\ \ \ \ | |/ / /
| * | | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we always use the absolute path to the pro file so it will just work from either source or build dir. This fixes the usecase where qmake generated a relative path starting with '..'
| * | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The code generated would always create the Makefile in the sourcedir, even if you had src!=build Reviewed-By: Thiago
* | | | Merge branch '4.6'Thiago Macieira2010-01-1349-49/+49
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0949-49/+49
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits) Reverted two commits that were pushed to the wrong branch. Use the new QTextCodec api in the QXmlStreamWriter. Added new functions to QTextCodec that accept ConversionFlags. Fix passing of arguments to syncqt doc: Fixed typos. Fixes: Fix spinbox with NoButton style in QGtkStyle doc: Explained parameter value defaults where appropriate. Cocoa: Fix painting errors on QGLWidget resizing. Fix broken QGLWidget::renderPixmap on Mac/Carbon Fixes: Setting any style sheet breaks checkbox positioning Fixes: MenuItem size fixes and missing separator with Gtk+ Autotest: add a test for QNAM's HTTP cache handling code QNAM HTTP: just use the expirationDate in the code that validates the cache QNAM HTTP: change the caching semantics to match documentation QNAM HTTP: fix the caching algorithm from RFC 2616 Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner improve readability a bit more fix styling; improve readability make it possible to retrieve name of the user who owns the file Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) ...
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-8/+5
| | |\ \ \
| | * | | | Update copyright year to 2010Jason McDonald2010-01-0649-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Merge branch '4.6'Thiago Macieira2010-01-121-6/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-071-6/+1
| | |/ / / | |/| | | | | | | | | | | | | Reviewed-by: axis
* | | | | Merge branch '4.6'Thiago Macieira2010-01-081-8/+5
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * | | Minor logic fix to Symbian generator in qmakeMiikka Heikkinen2010-01-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include meant to be under restore_build was getting included always. This is actually how it should work, so removed the empty restore_build target entirely. Reviewed-by: Janne Anttila
| * | | Deal with test cases that crash or hangShane Kearns2010-01-041-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen
* | | Merge branch '4.6'Thiago Macieira2009-12-266-26/+97
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * | Changed make sis only require .make.cache if QT_SIS_TARGET is not set.Miikka Heikkinen2009-12-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The .make.cache file contents are ignored if QT_SIS_TARGET environment variable is set, so there is no point in requiring its existence in those cases. Task-number: QTBUG-4617 Reviewed-by: Janne Anttila
| * | Added more specific clean targets for Symbian buildsMiikka Heikkinen2009-12-222-3/+57
| | | | | | | | | | | | | | | | | | | | | Also fixed sbsv2 build targets 'make release' and 'make debug'. Task-number: QTBUG-5156 Reviewed-by: Janne Koskinen
| * | Tool for launching symbian apps on the phone from windows command lineShane Kearns2009-12-214-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tool uses TRK to launch the application. TRK is a debug agent, available as a signed package for consumer phones. For Nokia phones, it is distributed with carbide; for other manufacturers it can be downloaded from their developer websites. The launcher code is reused from Qt creator, with a patch to allow us to pass command line arguments to the process being launched. The "make run" target is enhanced to support running on target as well as the emulator. Like the "make sis" target, the last platform to have been built is the one that will be launched. The runonphone tool needs to be built in a Qt environment configured for windows, and requires at least windows XP (Symbian development requires windows XP SP2). Current proposal is to include a statically linked exe in the bin directory for binary packages. Reviewed-by: Janne Koskinen
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-172-2/+5
| |\ \
| | * | Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj filesAndy Shaw2009-12-162-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Marius SO Details: It worked fine for Makefiles since no checking is done of the flags. Now its fixed so it works for vcproj files too making it easier for people to build 64bit targets in Visual Studio.
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-111-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * | | Fixed "make run" target for targets with special characters in them.Miikka Heikkinen2009-12-102-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Some misc whitespace got fixed, too. Reviewed-by: Janne Anttila
* | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-152-50/+111
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-092-50/+111
| |\ \ \ | | |/ /
| | * | MMP_RULES overriding qmake variables now warns userMiikka Heikkinen2009-12-042-50/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added warning to qmake when it detects MMP_RULES that override MMP statements created by qmake variables. Also harmonized the way << operator is used with #defined strings in symmake.cpp. Task-number: QTBUG-5407 Reviewed-by: Janne Anttila
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-1/+1
|\ \ \ \ | |/ / /
| * | | Apparently fixes some build issues on some old unixes...Pierre Rossi2009-12-041-1/+1
| |/ / | | | | | | | | | Reviewed-by: Marius Storm-Olsen
* | | Merge branch '4.6'Thiago Macieira2009-11-256-52/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | Fix ICON keyword to work with absolute paths also in SBSv2.Janne Anttila2009-11-201-1/+4
| | | | | | | | | | | | | | | Task-number: QTBUG-4745 Reviewed-by: Miikka Heikkinen
| * | Changed MIF filename from UID to target name in Symbian.Janne Anttila2009-11-186-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it possible to define ICON keyword in pro file without UID3. It is safe to use target as an icon name since Symbian devices cannot have two different binaries with the same name as all binaries are located in \sys\bin. This means there cannot be also two mif files with same target name. Also all native S60 apps use target name as an MIF basename. Target name is also much easier to associate with app than UID. Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| * | Remove temp dirs workaround for raptor builds onlyShane Kearns2009-11-096-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Webkit cannot build because of too long command lines in the sbsv2 config. There is an alternative workaround in raptor for the relative include paths problem, i.e. "sbs -c winscw_udeb.mwccinc" Removing the temp dirs from being created and added to systeminclude makes the command line short enough again that webkit can be compiled. Reviewed-By: Miikka Heikkinen Based on following commit from the no-tmp-dirs branch: commit 33e8c420bb40ca6194d29f96ef2fbd0f18340e6b Author: Iain <qt-info@nokia.com> Date: Wed Oct 7 13:45:48 2009 +0200 First attempt at removing the tmp dirs workaround on Symbian OS I may not have caught all the places where it is used, but MMP files look OK afterwards. TODO: Slightly concerned that I've trimmed too much from the abld generator as I think that the bit I cut was also used for other temp dirs
* | | Merge branch '4.6'Thiago Macieira2009-11-101-2/+42
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * | Initial LFLAGS support for qmake on Symbian OSIain2009-11-051-2/+42
| | | | | | | | | | | | Reviewed-by: Shane Kearns
generated by cgit v0.12 at 2024-12-03 10:27:22 (GMT)