summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-254-13/+147
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-221-2/+2
| | | | | | | | | | | | | | | | Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding include path that points under mkspecs. Task-number: QTBUG-15501 Reviewed-by: axis
| * Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-123-11/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
| * Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | This commit also fixes the issue that 564058a1bb didn't, namely that config tests broke on Symbian. It does this by continuing to use the Open C libcrt0.lib library for non-Qt applications. This is also more correct, since you should not have to compile the Qt libs to compile a non-Qt app. Task: QTBUG-14735 RevBy: Miikka Heikkinen
| * Make default application deployment removableMiikka Heikkinen2010-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
| * Revert "Use qtmain.lib to provide entry point for all Symbian applications"axis2010-11-051-2/+1
| | | | | | | | | | | | | | This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
* | Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | This commit also fixes the issue that 564058a1bb didn't, namely that config tests broke on Symbian. It does this by continuing to use the Open C libcrt0.lib library for non-Qt applications. This is also more correct, since you should not have to compile the Qt libs to compile a non-Qt app. Task: QTBUG-14735 RevBy: Miikka Heikkinen
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-068-33/+50
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior configure: Deal with multiple redefinitions of qmake variables Split QScriptValue::call autotest into smaller tests. Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue ...
| * | mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.confTor Arne Vestbø2010-11-052-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Since gcc-base is used for Clang and LLVM as well, we should not define QMAKE_CC and QMAKE_CXX there. Moving it to g++-base.conf reduces the risk of parsing errors in configure such as the one in dacda67ee449b6291. Reviewed-by: ossi
| * | mkspecs: Include gcc-base-unix.conf from g++.conf to match old behaviorTor Arne Vestbø2010-11-051-2/+3
| | | | | | | | | | | | Reviewed-by: ossi
| * | Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-023-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Configure has very basic parsing of mkspecs where it traverses includes, but assumes that the last seen value is the right one. Since this parsing does not take scopes into account we can't use tricks like isEmpty(). Reviewed-by: ossi
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-296-25/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| | * | mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-276-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people with their own mkspec who would still include g++.conf directly. We now print a warning if this situation is detected, and explain to the user how they can fix their mkspec. For convenience we redirect g++.conf to g++-unix.conf so that people's mkspecs will still work. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * | Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Using Open C's libcrt0.lib to provide entry point caused problems for applications that launched other processes, as Open C retains a handle to all launched processes even after said processes terminate. Task-number: QTBUG-14735 Reviewed-by: axis
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-291-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Correct RVCT4 parameter so it applies to all 4.x versions, not just 4.0
| * | | Correct RVCT4 parameter so it applies to all 4.x versions, not just 4.0Iain2010-10-291-2/+2
| | |/ | |/| | | | | | | | | | | | | Task-number: QTBUG-14851 Reviewed-by: Miikka Heikkinen Reviewed-by: Jason Barron
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-2/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * | Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-261-2/+2
| |\ \
| | * | Fixed various quotation problems when porting to Windows.axis2010-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-1/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cp on unix doesn't create the destination directory if it doesn't exist, as xcopy on windows does. This also requires QMAKE_MKDIR to use mkdir -p to be able to create directories recursively. Merge-request: 861 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | Add mkspecs for Clang on Linux and Mac OS XTor Arne Vestbø2010-10-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass "-platform unsupported/[macx|linux]-clang" and make sure you have a fairly recent trunk-build of Clang (r116737 or above). The platform is currently unsupported and there may be failing test. You have been warned. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2212-257/+306
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | | mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)Tor Arne Vestbø2010-10-185-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | Preparation for introducing Clang-style precompiled-header support. Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * | | Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-1310-248/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The g++ and llvm mkspecs now share the common parts in common/gcc-base.conf Each top level mkspec includes a platform-specific version of this base, either common/gcc-base-unix.conf or common/gcc-base-mac.conf, and these platform specific bases will include the cross-platform one. The same pattern is then used for the g++ specific configurations, which are split up into common/g++.conf, common/g++-unix.conf and common/g++-mac.conf The qplatformdefs.h for mac was also shared where possible. The test in tests/manual/mkspecs was used to ensure that the final output of all the mkspecs was the same after the refactoring as before. Reviewed-by: ossi
| * | | Merge branch '4.7-s60' into master-s60axis2010-10-082-10/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp
| | * | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed the use of DIR_SEPARATOR. It does not get defined until after symbian.conf has finished parsing. RevBy: Miikka Heikkinen
| * | | Make default application deployment removableMiikka Heikkinen2010-10-071-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Task-number: QTBUG-13367 Reviewed-by: axis
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-051-26/+36
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-26/+36
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| | * Improved Symbian4 platform detectionMiikka Heikkinen2010-09-231-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-273-22/+38
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-222-0/+5
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qtextureglyphcache_p.h src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
| | * Add breakpad supportMarco Bubke2010-09-202-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-22/+33
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| | * Load environment.prf from Symbian SDK if it exists thereMiikka Heikkinen2010-09-171-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | Environment.prf can contain SDK specific variable settings such as SYMBIAN_VERSION. Task-number: QT-3949 Reviewed-by: Janne Koskinen
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-132-1/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h src/corelib/tools/qsimd.cpp
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-102-1/+32
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| | * Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer require PRE_TARGETDEPS items to be absolute, which was difficult to achieve sometimes as qmake doesn't provide method for absolutizing paths. - Do smart command replacement for commands containing $$QMAKE_* command variables, such as $$QMAKE_COPY, when generating bld.inf extensions for QMAKE_EXTRA_* variables. $$QMAKE_* command variables cannot be passed to sbsv2 toolchain directly, as it uses cygwin in windows, and they can't simply be replaced to use sbsv2 equivalents in symbian.conf, because generated wrapper makefiles need them to be Windows compatible. Reviewed-by: axis
| | * Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-031-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Plenty of filenames got generated with spaces which didn't work as that was not taken into account. Harmonized TARGET fixing across prf files and qmake Symbian generator code. Task-number: QTBUG-13363 Reviewed-by: Thomas Zander
| | * QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)Miikka Heikkinen2010-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | QT_LIBINFIX is defined in qconfig.pri, so qt_config needs to be loaded before that is used. Reviewed-by: TrustMe
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-261-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro src/opengl/qgl.cpp src/opengl/qgl_p.h
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+6
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| | * Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-1/+6
| | | | | | | | | | | | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-1910-20/+46
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-139-19/+45
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| | * Added SYMBIAN_VERSION variable to qmake.axis2010-08-031-3/+17
| | | | | | | | | | | | | | | | | | | | | In addition, made Symbian^3 detection depend on libstdcppv5, which seems like the only option in the public Symbian^3 PDK. RevBy: Miikka Heikkinen
| | * Moved the S60 version detection to the common symbian profile.axis2010-08-032-18/+19
| | | | | | | | | | | | RevBy: Trust me
generated by cgit v0.12 at 2025-02-14 05:19:31 (GMT)