summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix gstreamer phonon build on X11Jørgen Lind2011-01-041-1/+1
| | | | | | | | I added an x11{ } clause in the pro file for the plugin. But as it turnes out the x11 clause is defined in gui.pro so it is not available for use in any other pro or pri files. Also fixed a missing !qpa in qttest_p4.prf
* Fixed PREPEND_INCLUDEPATH being executed too early.axis2010-12-213-16/+15
| | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-12-212-47/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Moved the default dependency targets to default_post.prf. Fixed autotest. get rid of QPrinterInfoPrivate::isNull member QPrinterInfo::supportedPaperSizes(): return early if the info is invalid fix QPrinterInfo::defaultPrinter() on win micro-optimizations, clean-ups and styling fixes refactoring of QPrinterInfo minor refactoring of QPrinterInfoPrivate use binary search int the string2PaperSize() helper
| *-. Merge branches 'nonQtApps-fix' and 'merge-request-2516' into master-s60axis2010-12-202-47/+47
| |\ \
| | * | Moved the default dependency targets to default_post.prf.axis2010-12-202-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-202-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | | Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To support linux builds, file names must be cased correctly. Task-number: QT-4375 Reviewed-by: Miikka Heikkinen
| * | | ICC: Don't print warning 1259 since it's too annoying.Thiago Macieira2010-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | ICC 12 keeps outputting this when you copy a type of larger size to a smaller, or from int to float.
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-12-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits) Add expected failures for JS test suite on Symbian Ensure ListView contentHeight is set to a valid size. Revert "Add mirroring-positioners.qml example" that was accidentally pushed Fix dragging Flickable back over start point. Add mirroring-positioners.qml example A QAIM model resulted in items moving to incorrect locations Build on Symbian refuse to open empty translation files fix path separator matching fix -dont-process for mingw cross-build fix nonsense condition Fix qwidget test crash QmlViewer: Remove trailing whitespace QmlViewer: Remove trailing whitespace QmlViewer: Fix crash on exit Don't include <features.h> directly: non-standard header. Remove superfluous OpenGL linking for QtDeclarative Corrected case on Symbian library. Missing glyphs in GL when scaling QStaticText and QML text items PathView: removing the currentIndex could make it invalid. ...
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| | * | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* | | | | Fix comctl32 v6 dependency generation in Visual Studio 2005 and higherminiak2010-12-133-9/+9
|/ / / / | | | | | | | | | | | | | | | | Merge-request: 2526 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-12-074-54/+80
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (101 commits) Fix QTextEdit::selectAll crash from textChanged() Fix proxy reading from gconf so that it is only done once / session. rebuild configure fix misleading uppercasing deprecation warning Enable Phonon on Symbian by default. Disable OpenGL on Symbian only by default instead of always VFP type on ARM option in Linux configure script Adding -dont-process option to Unix configure script Synchronized configure.exe OpenGL options with Unix configure build lrelease as part of the "libs" part. purge vestiges of imageformat-plugins Unify epocroot usage in createpackage and patch_capabilities scripts Update visual tests for the recent qmlviewer change Do not use openGL on Mac OS X for QML visual tests Give qmlviewer a minimum size if root object has no size. Add 'Writing New Components' docs, and document the connect() function. Mention that image providers should be added before loading QML files Update QML visual tests Cleaned up sis_targets.prf Append qml import path individually for each available drive on Symbian ...
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-064-54/+80
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * | Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-48/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the unnecessary checks for the case where pkg file doesn't exist are no longer needed as we now have dependencies to pkg files and no sis creation targets are generated if pkg is not generated. Also improved documentation a bit and added the missing ok_installer_sis target generation. Reviewed-by: Janne Koskinen
| | * | Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-292-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing Symbian language codes for which an Qt equivalent was available. Some codes were mapped to language/country pairs. Task-number: QTBUG-15293 Reviewed-by: Janne Koskinen
| | * | Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any application linking to QtNetwork, QtWebKit, or QtDeclarative is likely to utilize network, so add NetworkServices capabiltity for these applications by default in Symbian. Also increased the default epocheap maximum size for these applications. Task-number: QTBUG-14472 Reviewed-by: Janne Koskinen
* | | | Add library prefixes for Cygwinİsmail Dönmez2010-12-071-0/+3
|/ / / | | | | | | | | | | | | Merge-request: 2520 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Changed various DEPLOYMENT variable ".sources" suffixes to ".files"Miikka Heikkinen2010-12-021-3/+3
| |/ |/| | | | | | | | | | | Starting from Qt 4.8, ".files" is the correct variable suffix to use for declaring deployment files. Reviewed-by: Janne Koskinen
* | gdb_dwarf_index: change version constraint from 72 to 73Arvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | | | We previously made the false assumption that gdb 7.2 matches sourceware master (which claims to be 7.2, but really is 7.3)
* | Revert "Remove gdb_dwarf_index from maemo mkspec"Arvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | This reverts commit 7643d1016a6b4776cf671bbc595ec83002d2cc4e.
* | Remove gdb_dwarf_index from maemo mkspecArvid Ephraim Picciani2010-11-261-1/+1
| | | | | | | | maemo6 has gdb7.2 but not gdb-index
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-2510-22/+276
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-3/+3
| | | | | | | | | | | | | | | | Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding include path that points under mkspecs. Task-number: QTBUG-15501 Reviewed-by: axis
| * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-5/+2
| |\ | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-128-19/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | no_debug_info.prf: Also handle MSVC.hjk2010-11-221-4/+13
| | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-191-5/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * | Enable OpenGL scissors testAdrian Constantin2010-11-151-3/+0
| | | | | | | | | | | | Reviewed-by: Petri Latvala
| * | Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, ↵Petri Latvala2010-11-151-2/+2
| |/ | | | | | | | | | | add -Wno-psabi Reviewed-by: Adrian Constantin
* | Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2010-11-181-4/+1
| | | | | | | | | | | | | | Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion. Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf. RevBy: Miikka Heikkinen
* | Unified the usage of $${EPOCROOT} for symbian.Liang Qi2010-11-182-11/+11
| | | | | | | | RevBy: Miikka Heikkinen
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-082-4/+12
| | | | | | | | RevBy: Miikka Heikkinen
| * Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-083-16/+21
| | | | | | | | | | | | | | | | | | | | | | 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-083-20/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-7/+19
| | | | | | | | | | | | | | This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
* | Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-092-5/+13
| | | | | | | | RevBy: Miikka Heikkinen
* | Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-093-6/+23
| | | | | | | | | | | | | | | | | | | | | | 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-0620-54/+81
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-13/+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: Make linux-x86-openkode-g++ not include g++.conf directlyTor Arne Vestbø2010-11-051-1/+2
| | | | | | | | | | | | 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
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0519-45/+73
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (40 commits) 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 Add more microbenchmarks for QScriptEngine QNAM HTTP: Do not set cache headers when already set by user QNAM: Do not cache network connections per username. Refactor tst_QScriptValue::instanceOf Refactor tst_QScriptValue::getSetPrototype ...
| | * | There is no predefined qmake x11 scope for x11 builds.Robert Griebl2010-11-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the autotests that are using a x11{} scope to add QMAKE_LIBS_X11 to LIBS are actually not adding anything at all, but just happen to build correctly because the standard GNU ld resolves symbols in shared libraries recursively (and libQtGui depends on all those X libs already). Building those tests with GNU gold will lead to undefined X* symbols, since gold doesn't use implicitly dependant libs to resolve symbols. Reviewed-by: Harald Fernengel
| | * | Don't use scopes in mkspecs as configure does not support themTor Arne Vestbø2010-11-029-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2914-38/+48
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * \ Merge remote branch 'scm/qt/master'Tor Arne Vestbø2010-10-282-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/symbian-gcce/qmake.conf
| | | * | | mkspecs: Emit warning when including g++.conf directlyTor Arne Vestbø2010-10-2714-37/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-053-19/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
generated by cgit v0.12 at 2025-01-16 19:28:09 (GMT)