summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change to release license header.Jason McDonald2011-02-161-13/+13
| | | | Reviewed-by: Trust Me
* Fix regression in creating mkspecs/defaultMiikka Heikkinen2011-02-101-24/+6
| | | | | | | | | Copy all files from original mkspec to default one and modify *.conf, *.prf, and *.h to include their original counterparts. Task-number: QTBUG-17258 Reviewed-by: Oswald Buddenhagen (cherry picked from commit b52bf57e46520fb65d3d4c43bdb9c3d972690cb8)
* Update copyright year to 2011.Jason McDonald2011-01-111-1/+1
| | | | | Reviewed-by: Trust Me (cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
* Use relative include instead of absolute in default qmake.confMiikka Heikkinen2010-12-171-1/+7
| | | | | | | | | | Absolute include path breaks QtP releases which copy mkspecs under epoc32 and do not necessarily have the sources available in the original absolute path and can't patch the paths either at installation time. Task-number: QTBUG-16172 Reviewed-by: Oswald Buddenhagen
* Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-0/+2
| | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* Synchronized configure.exe OpenGL options with Unix configureOleh Vasyura2010-12-031-2/+23
| | | | | | | | | | | Windows configure tool and Linux configure script use different options for OpenGL modules. Windows configure tool uses -opengl-es-cm and -opengl-es-2. Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common. Windows configure tool is changed to understand Linux OpenGL configure options as well. The old options are retained for compatibility but not documented any more. Reviewed-by: ossi
* purge vestiges of imageformat-pluginsMark Brand2010-12-031-8/+0
| | | | | | | | | | | | | | The imageformat-plugins variable is never referenced by the .pr[io] for building Qt. Its presence in configure.exe appears to be a vestige of an earlier state of affairs. As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built as plugins. The default is plugin. During configuration, this can be overridden by adding, for example, "no-jpeg" to disable support altogether or "jpeg" to build into QtGui. Merge-request: 961 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add missing newline to configure.exe output.Jason McDonald2010-11-261-1/+1
| | | | Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-241-8/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits) Fixed tst_qwidget::winIdChangeEvent Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. ...
| * Use include(original mkspec) instead of copying of mkspec to defaultMiikka Heikkinen2010-11-161-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having QMAKESPEC_ORIGINAL at the end of the default qmake.conf sets the mkspec too late for scope checks in symbian-mmp.conf and related files. Fixed by changing how default mkspec is handled: it is no longer simply copied over to mkspecs/default by configure but rather included with include statement in the generated mkspecs/default/qmake.conf after setting of QMAKESPEC_ORIGINAL value. This should also fix any issues with relative includes in mkspecs used as default that are not on same level as mkspecs/default folder. Task-number: QTBUG-15159 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann
* | Prevent compilers optimizing eval timebomb code out of existence.Jason McDonald2010-11-241-1/+1
|/ | | | | | | | | | | | | | | | The variable that holds the eval license key is a placeholder that is patched during package installation. Unfortunately, for a non-final package build, the placeholder is filled with nulls at compile-time and a clever compiler will optimize away most of the eval timebomb code due to a check in the eval code for the first character of the license key being null. This commit makes the variable that holds the license key volatile, to convince compilers that they cannot make assumptions about the contents of the variable when optimizing. Task-number: QT-3848 Acked-by: Thiago Macieira
* fix build key generation for realOswald Buddenhagen2010-09-231-1/+1
| | | | | Reviewed-by: danimo Task-number: QTBUG-13795
* Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-3/+13
| | | | | | | | With this patch one can configure with -webkit-debug to build Webkit with debug symbols without having to manually edit WebCore.pro. Merge-request: 816 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-0/+11
| | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
* explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-2/+2
| | | | | | | otherwise it would stay around from a possible previous build with webkit and confuse the heck out of the build system. Task-number: QTBUG-13459
* Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-0/+4
| | | | | | OpenC does not fully support IPv6, therefore we cannot either. Reviewed-by: ogoffart
* Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-021-1/+13
| | | | | | | | | | The option is on when building Qt, but off by default for other projects, due to potential incompatible compile options in other projects. (/E, /EP, /Gm, /Yc, /showIncludes, #import preprocessor directive) Reviewed-by: bhughes Reviewed-by: ossi
* fix windows build with -prefixOswald Buddenhagen2010-08-311-3/+5
| | | | | | | | | | | passing just a spec name to qmake is bogus, as it will try to find it in the install dir, which of course won't work before it is installed. so either pass nothing at all (when preparing the libraries, as .qmake.cache already contains the right path), or explicitly pass a full path (when building the host tools, as we have to override the spec here). Reviewed-by: mariusSO
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-261-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Autotest: don't use Q_FUNC_INFO for testing which method got called fix generated makefile dependencies Cocoa: Demo browser can get stuck after closing modal dialog Restore default if to system default on session close. tst_qmake doesn't need QtGui Use the full path to qmake in the qmake unit test qdoc: Fixed erroneous links to QML basic types. Fixed item view background color in Gtk style scope fixes and clutter reduction for sql driver projects I don't know why some linkers can't call this function, so comment it out. QNetworkSession::close() method now send closed() signal while faking disconnection. Add the missing license headers to the QString benchmark data Fix building of qsimd.cpp on Windows CE Use QElapsedTimer for the benchlib tests. Properly implement the CPU feature disabling in qsimd.cpp. Report the detected CPU features in the corelib boilerplate Detect CPU features on ARM by reading the ELF auxvec. Split the CPU-detection code into multiple functions for readability Fixed delivering gestures to a toplevel widget. Unroll the SSSE3 code even more to avoid the need to keep an extra variable for inverting the result ...
| * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
| * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-231-2/+1
| | | | | | | | | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-8/+8
|\ \ | |/ |/| | | | | | | | | Conflicts: bin/syncqt src/opengl/qgl.cpp tools/configure/configureapp.cpp
| * fix Norwegian Breakfast Network warnings in configureJoerg Bornemann2010-08-201-8/+8
| | | | | | | | Reviewed-by: ossi
| * re-add overriding of tool paths to configureOswald Buddenhagen2010-05-171-0/+5
| | | | | | | | | | | | | | | | unlike originally planned, we didn't remove the setting of the tool paths from the qmake specs - for compat reasons. however, that means that they will make the QT_BUILD_TREE handling in qtPrepareTool ineffective, which meant that the qt build would try to use the tools from an installed qt ...
| * define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* | fix loading of module configsOswald Buddenhagen2010-08-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | do it in qt_config.prf instead of in the autogenerated qconfig.pri files. this is waaaay more elegant, and allows us to easily use the magic in that file which avoids loading qt configuration from the qt install dir while building qt itself. Reviewed-by: joerg Reviewed-by: Simon Hausmann Task-number: QTBUG-12698
* | configure.exe: don't write the QT_NAMESPACE define to .qmake.cacheJoerg Bornemann2010-08-111-1/+0
| | | | | | | | | | | | | | | | | | Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the QT_NAMESPACE=MyNamespace define for us. Task-number: QTBUG-5221 Reviewed-by: ossi
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-041-0/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| * | Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-041-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-4/+12
|/ / | | | | | | | | | | | | | | | | | | | | It has been requested that we provide a configuration option to specify the default "inner" graphics system that should be used when the runtime graphics system is in use. The argument specified to the option is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is used to instantiate the default graphics system that will be used by the runtime graphics system. Reviewed-by: Gunnar Sletta
* | Make it possible for Qt modules to extend QT_CONFIGSimon Hausmann2010-07-231-0/+2
| | | | | | | | | | | | | | | | This is done by reading the module files from within qconfig.pri. Task-number: QTBUG-12379 Rubber-stamped-by: Joerg Bornemann Rubber-stamped-by: Marius Storm-Olsen
* | make "configure -qt-gif" work again on WindowsJoerg Bornemann2010-07-211-2/+2
| | | | | | | | | | | | The value for GIF must be "plugin" and not "yes". Reviewed-by: danimo
* | Make configure.exe accept -no-gif again, fix commentDaniel Molkentin2010-07-191-1/+3
| | | | | | | | Reviewed-By: Jason McDonald
* | fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-10/+0
| | | | | | | | | | | | | | | | don't have configure create the forwarding headers (or symlinks on unix) for qconfig.h, but instead have syncqt create forwarding headers for not yet existing files. Reviewed-by: joerg
* | fixed built-in jpeg and tiff in configure.exe, QTBUG-12093Mark Brand2010-07-121-0/+4
| | | | | | | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | fix indentationMark Brand2010-07-121-1/+1
| | | | | | | | | | Merge-request: 740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix Windows buildMark Brand2010-07-031-4/+4
| | | | | | | | | | | | | | | | Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does. This avoids that we try to link the image handlers into QtGui when they are built as plugins. Reviewed-by: ossi
* | Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-42/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, although the configure shell script could configure built-in support for these image formats, the .pr[io] files would nevertheless build them as plugins. Support was also missing from qimagereader and qimagewriter. This has now been added. Configure.exe, while clearly intended to support this too, needed a few minor fixes. For example, the usage of values "qt" and "yes" was inconsistent. For both configure tools, the explanation of the *non*-related options has been clarified, i.e: -no-libjpeg -qt-libjpeg -system-libjpeg These options have nothing to do with the plugin/built-in distinction. There are (still) no configure options for specifying "plugin" or "built-in" for these image formats. Quite reasonably, "plugin" is selected for shared Qt and "built-in" is selected for static Qt. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Split image handler plugin project filesMark Brand2010-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Reformat whitespace according to coding styleMark Brand2010-06-301-596/+596
| | | | | | | | | | | | | | | | Mostly indentation affected, but also standardized spaces adjacent to () in configureapp.cpp. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | | | | | | | | | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | make postgresql support sensitive to PSQL_LIBSMark Brand2010-06-101-0/+4
| | | | | | | | | | | | | | | | | | The PSQL_LIBS environment variable is a standard way to pass the required library list. The changes here add support for this to the configures. Merge-request: 673 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-281-8/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missign license headers. Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-201-31/+31
| |\ \
| * | | QRuntimeGraphicsSystemJani Hautakangas2010-05-201-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRuntimeGraphicsSystem is a proxy graphics system which can dynamically switch underlying graphics system on runtime. For example, switch from hardware accelerated graphics system to raster graphics system on low GPU memory situation. This feature is currently supported on Symbian platform. Task-number: QT-3276 Reviewed-by: Jason Barron
* | | | fix & unify path separator escapingOswald Buddenhagen2010-05-271-48/+56
| |/ / |/| | | | | | | | Reviewed-by: mauricek
* | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-28/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * | | | Removed mediaservices.Kurt Korbatits2010-05-181-28/+1
| | |/ / | |/| |
* | | | Shadow building on Symbian fixes: part 2 - populate bin dir correctlyIain2010-05-141-1/+28
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Second in a set of fixes for shadow building on Symbian - create links in the shadow bin dir to the Symbian specific scripts we've added to the bin directory Task-number: QTBUG-10432 Reviewed-by: Alessandro Portale
generated by cgit v0.12 at 2024-07-16 11:04:18 (GMT)