summaryrefslogtreecommitdiffstats
path: root/qmake/project.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-181-10/+24
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/makefile.cpp qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/global/qnamespace.h src/gui/text/qtextcontrol.cpp
| * look for makespec in the build dir firstOswald Buddenhagen2011-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | it's more natural to look into the build dir before the source dir, and it's what the qmake-generated makefiles mean when re-invoking qmake. specifically, this works around the problem that relative paths with excess ".."s pointing below the root are happily ignored and thus truly bizarre makespec paths may be constructed by the qmake re-invocations if the source dir is less nested than the build dir. Task-number: QTBUG-9817 Reviewed-by: mariusSO
| * useful location reporting for errors from QMAKE_SUBSTITUTESOswald Buddenhagen2011-04-121-0/+14
| | | | | | | | Reviewed-by: mariusSO
| * prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"Oswald Buddenhagen2011-04-121-7/+7
| | | | | | | | | | | | | | that way prf files don't have to check both the prefix and the actual template to identify visual studio mode. Reviewed-by: mariusSO
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-221-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/positioners/layoutdirection/layoutdirection.qml src/corelib/global/qglobal.h src/plugins/qpluginbase.pri src/qbase.pri src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def 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_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
| * remove redundand validateModes() callOswald Buddenhagen2011-03-211-1/+0
| | | | | | | | i added another one a few lines above ...
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-5/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc mkspecs/symbian-gcce/qmake.conf qmake/project.cpp src/corelib/global/qnamespace.qdoc src/declarative/graphicsitems/qdeclarativetext.cpp src/gui/text/qtextdocumentlayout.cpp src/gui/text/qtextdocumentlayout_p.h tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp tests/auto/networkselftest/networkselftest.pro tests/auto/qscriptengine/tst_qscriptengine.cpp tools/designer/src/components/signalsloteditor/signalslot_utils.cpp tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp 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 tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * complain about unmatched quotes/parensOswald Buddenhagen2011-02-031-1/+12
| | | | | | | | | | | | | | | | using WarnDeprecated instead of WarnParser is a bit backwards, but we need something which is on by default and i don't feel like introducing a second parser warning mode for that. Reviewed-by: mariusSO
| * use const refOswald Buddenhagen2011-02-031-1/+1
| | | | | | | | Reviewed-by: mariusSO
| * move multiple inclusion check for feature files to correct locationOswald Buddenhagen2011-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | previously, features specified with an absolute path would not be covered by the multiple inclusion guard, unlike the one specified just by a name. this is of theoretical value only, as nobody specifies features via absolute path anyway ... Reviewed-by: mariusSO
* | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor get rid of extra calls to handle() simplify QSharedMemory::detach() avoid extra calculations fix error reporting on detach() fix error reporting Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs. Fix to pen state handling in OpenVG paint engine. BorderImage fails for .sci source containing a URL positionViewAtIndex can fail when positioned near end of list. Revert "Fix loaded() signal to be emitted only once" Revert "don't include harfbuzz where we don't use it" ...
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-0/+2
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| | * make sure Option::dir_sep is initialized in timeOswald Buddenhagen2011-01-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | querying $$DIR_SEPARATOR (possibly indirectly via $$QMAKE_DIR_SEP) may happen before querying any os scopes, so better make it initialize the host mode explicitly. loading features theoretically needs an initialized dir_sep as well (to detect relative paths), so take care of that as well. Task-number: QTBUG-10633 Reviewed-by: mariusSO
* | | interpret backslash escaping of quotes in split_arg_list()Oswald Buddenhagen2011-01-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | split_value_list() interprets them, too, but this is useless if the higher layer doesn't and is thus confused by unmatched quotes. note the top-level parsing layer doesn't support escapes, but that's ok, because there function calls are "isolated" by non-escapable parenthesis counting (and the RHS of assignments is not subject to any parsing at all). Reviewed-by: mariusSO
* | | cleanup split_arg_list() some moreOswald Buddenhagen2011-01-251-5/+6
| | | | | | | | | | | | | | | | | | | | | unify the code paths for last and intermediate arguments. as a side effect, this should be somewhat more efficient. Reviewed-by: mariusSO
* | | slightly reorganize split_arg_list()Oswald Buddenhagen2011-01-251-31/+28
| | | | | | | | | | | | | | | | | | cut down code duplication Reviewed-by: mariusSO
* | | remove the somewhat bizarre unquoting of the last argument in split_arg_list()Oswald Buddenhagen2011-01-251-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | the last argument would be unquoted, but only if currently in a quote. that means that an invalid construct like "foo"" would be reduced to another invalid construct foo". this doesn't sound overly useful ... Reviewed-by: mariusSO
* | | remove the completely insane quote nesting from split_value_list()Oswald Buddenhagen2011-01-251-6/+6
|/ / | | | | | | | | | | | | | | | | "foo 'bar "whee"' baz" would be actually treated like nested quotes. of course, this makes utterly no sense, as both the layers below and above couldn't do anything with that. and it would break actually useful things like quoting an apostrophe. Reviewed-by: mariusSO
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * fix path separator matchingOswald Buddenhagen2010-12-101-2/+2
| | | | | | | | use QDir::separator() instead of Option::dir_sep in localOS context.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-3/+2
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * fix misleading uppercasing deprecation warningOswald Buddenhagen2010-12-031-3/+2
| | | | | | | | | | | | | | | | don't complain about uppercasing in the function's name if the real problem is that it's not defined at all. this is also slighly more efficient, as we try to lowercase only as a fallback now. Reviewed-by: joerg
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed namespace issues related to epocroot.cppMiikka Heikkinen2010-11-191-2/+2
| | | | | | | | | | Task-number: QTBUG-15393 Reviewed-by: axis
| * Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-081-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMakeProject::parse() calls QString::simplified(), which assumes any byte 0xA0 in multibyte UTF-8 characters is a space character (0x00A0 is unicode character NBSP [non-breaking space]) and replaces those bytes with regular space, corrupting the UTF-8 string. Fixed by temporarily changing all 0xA0 bytes in parser input to another non-space character 0x01A0. This is safe replacement as qmake doesn't accept unicode .pro files, so there should never be actual NBSP or the replacement 0x01A0 characters in a valid .pro file. Note that there are a couple of more uses of QString::simplified() in qmake, but those do not deal with strings that need to be UTF-8 compatible as far as I can tell, so no need to touch them. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 15a7626480b64d85992bed819fe6052e0c5c8fa9 Task-number: QTBUG-15068 Task-number: QTBUG-14357 Reviewed-by: Oswald Buddenhagen
* | Make qmake to pass all UTF-8 characters unchanged through parser.Miikka Heikkinen2010-11-041-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMakeProject::parse() calls QString::simplified(), which assumes any byte 0xA0 in multibyte UTF-8 characters is a space character (0x00A0 is unicode character NBSP [non-breaking space]) and replaces those bytes with regular space, corrupting the UTF-8 string. Fixed by temporarily changing all 0xA0 bytes in parser input to another non-space character 0x01A0. This is safe replacement as qmake doesn't accept unicode .pro files, so there should never be actual NBSP or the replacement 0x01A0 characters in a valid .pro file. Note that there are a couple of more uses of QString::simplified() in qmake, but those do not deal with strings that need to be UTF-8 compatible as far as I can tell, so no need to touch them. Task-number: QTBUG-14357 Reviewed-by: Oswald Buddenhagen
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-2/+2
|\ \ | |/
| * Fixed many spelling errors.Rohan McGovern2010-10-251-2/+2
| |
* | qmake: qmakeDeleteCacheClear() function can be template nowminiak2010-08-031-2/+2
|/ | | | | Merge-request: 756 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| | | | | | | | it is not done for the top-level file, either. this is minimally behavior-incompatible, but anyone relying on the old behavior (and thus not using $$basename()) should be shot anyway. :) Reviewed-by: joerg
* add some commentsOswald Buddenhagen2010-06-231-2/+2
|
* remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-231-10/+0
| | | | | | | google has no mention of it except for a single orphaned instance in our own source code => trash. Reviewed-by: joerg
* fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| | | | Reviewed-by: joerg
* complain about unescaped backslashesOswald Buddenhagen2010-05-261-0/+6
|
* clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
| | | | Reviewed-by: joerg
* close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
| | | | | | the code assumed it anyway and would make a mess if it was wrong Reviewed-by: joerg
* unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-201-7/+6
| | | | | | | | | | | the value of the variable in Option is only ever accessed via the project variable, so there is no point in early fixing. as it happens, this fixes mingw+sh generating makefiles with the wrong separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was read back into Option. Reviewed-by: joerg
* bye bye QMakeProjectEnvOswald Buddenhagen2010-04-301-41/+5
| | | | | | | | | | | | | | qmake variables would have been exported to the command run by $$system() and - optionally - to the command run by system(). however, this was a unix-only feature and made the kernel barf at the huge environment on older linuxes. as we don't like platform-specific hacks which are unreliable, in particular when a workaround exists (the commands execute shell code after all, so one can inject arbitrary env variables), just blow it away - it was undocumented, after all. Reviewed-by: joerg
* short-cut evaluation inside if() testsOswald Buddenhagen2010-04-301-6/+3
| | | | | | | | this is consistent with the top-level scope evaluation. if() is undocumented and the old behavior would be pretty unexpected for anyone, so i feel free to break compatibility. Reviewed-by: joerg
* eliminate special splitting of INCLUDEPATH and DEPENDPATHOswald Buddenhagen2010-04-301-5/+3
| | | | | | | | | | | it wouldn't work as expected anyway, as the splitting rule (using the semicolon in addition to whitespace) applied only to the string literal from the pro file, but not any expanded [environment] variables, etc. (i.e., where it might make any sense). so just drop it, as it would considerably complicate later optimizations. it wasn't documented anyway ... Reviewed-by: joerg
* do not env-expand cache file pathOswald Buddenhagen2010-04-301-1/+1
| | | | | | | it makes totally no sense - if one wanted to expand env variables, one would let the shell do it. Reviewed-by: joerg
* warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| | | | Reviewed-by: joerg
* warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| | | | | | planning to kill off that (mis-)feature at some point. Reviewed-by: joerg
* make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-301-0/+6
| | | | Reviewed-by: joerg
* fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+1
| | | | | Reviewed-by: Janne Anttila Reviewed-by: joerg
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-181-4/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation Autotest: update to the new values for the locale do not expand variables in read()'s file name remove ability to use break() a block outside any loop don't add -unix to the qmake command line Increase the timeout for the QNAM getter test to 30 seconds Remove unstable hosts from the list qdoc: Output TOC for more class ref pages. Other fixes to the remote network stresstester Fix SSL connection problem. Make sure we don't try URLs that aren't HTTP or HTTPS Fix menu bar visibility. Add SSL remote host tests Split the remote and the local tests in two, in preparation for SSL tests Add tests for remote hosts Change the way we calculate the average transfer rates. Finish renaming Move these tests to tests/manual. Add a QNetworkAccessManager stresstest Add a non-blocking native function too ...
| * do not expand variables in read()'s file nameOswald Buddenhagen2010-04-161-2/+1
| | | | | | | | | | | | | | it is positively backwards to apply any expansions at such a low level - they have already been applied where necessary. Reviewed-by: mariusSO
generated by cgit v0.12 at 2024-09-25 18:26:54 (GMT)