summaryrefslogtreecommitdiffstats
path: root/qmake
Commit message (Collapse)AuthorAgeFilesLines
* fix qmake project file following msvc2010 additionOswald Buddenhagen2010-05-061-3/+5
| | | | this is relevant only for maintainers, but still.
* remove extraneous return statementOswald Buddenhagen2010-05-061-1/+0
|
* cosmetics: change enum valueOswald Buddenhagen2010-05-061-1/+1
| | | | | the existing values are fixed-point representations of the msvc versions, so adhere to it.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-023-41/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix project file generation for MSVC 2010 Fix wrong translation and clip for the raster paint-engine on Mac Return the correct library name in qt_gl_library_name for GLES* qmake: remove useless evaluation of variables from VS project generators Fix QT_NO_LIBRARY Documentation for the Elastic Nodes example. qmake: fix duplicate linker options in VS project files Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent. qmake: fix duplicate compiler options in VS project files Documentation for the Drag and Drop Robot example. Fix crash in styles example when running with opengl graphicssystem Fixed the sizehint for cols/rows in qtableview QUrl: parsing of host name with an undercore. Null pointer check Revert "Try to use multisampled opengl graphicssystem on all platforms" A small mistake when comparing the flag. Add unit tests covering most of QVector's API. Fix crash when CoreText fails to shape text for us Fix crash when using opengl graphicssystem on desktop Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
| * Fix project file generation for MSVC 2010Martin Petersson2010-04-302-3/+32
| | | | | | | | | | | | Adding the post-build step to copy the dll into bin Reviewed-By: Thierry
| * qmake: remove useless evaluation of variables from VS project generatorsJoerg Bornemann2010-04-292-16/+0
| | | | | | | | | | | | | | | | The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE, QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf files in mkspecs/features and don't need to be evaluated by generators. Reviewed-by: ossi
| * qmake: fix duplicate linker options in VS project filesJoerg Bornemann2010-04-292-14/+0
| | | | | | | | | | | | | | | | | | We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS. These files do it for us: mkspecs/features/win32/console.prf mkspecs/features/win32/windows.prf Reviewed-by: andy
| * qmake: fix duplicate compiler options in VS project filesJoerg Bornemann2010-04-292-8/+0
| | | | | | | | | | | | | | We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF mkspecs/features/warn_on.prf / ..._off.prf do it for us. Reviewed-by: andy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-026-70/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| * | 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
| * | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| | | | | | | | | | | | Reviewed-by: joerg
| * | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| | | | | | | | | | | | 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
| * | add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8
| | | | | | | | | | | | Reviewed-by: joerg
| * | make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-302-3/+6
| | | | | | | | | | | | Reviewed-by: joerg
| * | document some functions' scopeOswald Buddenhagen2010-04-301-5/+5
| | | | | | | | | | | | Reviewed-by: joerg
| * | fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+1
| |/ | | | | | | | | Reviewed-by: Janne Anttila Reviewed-by: joerg
* | Fix path removal from target in Symbian buildsMiikka Heikkinen2010-04-301-3/+6
|/ | | | | | | Qt generic slash separator must be supported also in platforms that do not have that as platform specific separator. Reviewed-by: Thomas Zander
* fix nmake build with win32-msvc2010Joerg Bornemann2010-04-261-1/+1
| | | | Reviewed-by: Martin Petersson
* Fix all qmake Makefiles to include the MSBuild backendMarius Storm-Olsen2010-04-244-8/+26
| | | | Reviewed-by: trustme
* Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-2113-12/+5090
| | | | Reviewed-by: Marius SO
* 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
| * remove ability to use break() a block outside any loopOswald Buddenhagen2010-04-161-2/+0
| | | | | | | | | | | | | | it is a completely bizarre feature which is nowhere documented and no justification for it is provided anywhere. Reviewed-by: mariusSO
* | Fix option(recursive)Miikka Heikkinen2010-04-151-1/+1
|/ | | | | | | | | QMakeProject::init initializes the whole project, while QMakeProject::reset initializes the parser for a single file. "recursive" needs to apply to the whole project. Task-number: QTBUG-9847 Reviewed-by: Oswald Buddenhagen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-151-1/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
| * Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-151-1/+3
| | | | | | | | Reviewed-by: Janne Koskinen
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-152-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-142-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-142-1/+2
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp
| | | * Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are valid cases where Qt .flm files found under /epoc32/tools/makefile_templates/qt/ have newer timestamp than those in Qt repo one is developing against but still need to be overwritten, so always export .flm files when the timestamp is different instead of just when the files to be exported are newer. Task-number: QT-3253 Reviewed-by: TrustMe
| | | * Make qmake possible to build with mingw using qmake.proMiikka Heikkinen2010-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added missing libraries Reviewed-by: Marius Storm-Olsen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-141-4/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF: fixed typo in trace statement Update to def files for 4.7.0-beta1 Fixed installer_sis target for 4.7
| * | | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | Due to pkg file generation refactoring in 4.7, these fixes hadn't been ported from 4.6 to 4.7 previously. Task-number: QTBUG-9864 Reviewed-by: Janne Koskinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-132-19/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-122-19/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits) QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much Implement heightForWidth support for QTabWidget and QStackedLayout. Fix the doc for QFrame::frameStyle Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D Add runtime check for GLX >= 1.3 before using glXCreatePixmap ...
| | * | fix cetest build properlyJoerg Bornemann2010-04-122-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for cetest. Reverting my initial naive attempt to fix this bd5d323373dbaf9d827126b77895da253128c1e5. We're introducing a new define for building qmake without generators. QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of the Visual Studio Add-in. Reviewed-by: ossi
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-132-1/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| * | | fix non-bootstrapped qmake buildOswald Buddenhagen2010-04-071-0/+2
| | | |
| * | | comment out variable which is used only by commented out debug codeOswald Buddenhagen2010-04-071-1/+1
| |/ /
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-122-110/+62
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-122-110/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION_FLAGS.<keyword> can now be used for all compilers and not just armcc, and version flagging can now be used with QMAKE_LFLAGS as well as QMAKE_CXXFLAGS. Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords for OPTION and LINKEROPTION statements, which are defined via QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables. This improves flexibility in the future if new keywords need to be supported. Task-number: QTBUG-8685 Reviewed-by: Janne Koskinen
* | Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++Zeno Albisser2010-04-061-0/+15
| | | | | | | | | | | | | | | | The variable QMAKE_TARGET.arch shall be used to determine cross compiling for x64 on a x32 system. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-9160
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-015-10/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-015-10/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| | * | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| | | | | | | | | | | | | | | | | | | | Remove local defines and passing of a list while its never used, only define it where its actually used.
generated by cgit v0.12 at 2024-11-06 15:34:22 (GMT)