summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-201-0/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
| * add QT_CONFIG's static/shared to CONFIG on startupOswald Buddenhagen2013-02-181-0/+1
| | | | | | | | | | | | | | | | | | ... instead of as a fallback in default_post. it was this way in qt4, and it requires less code to be written in the end. we are already doing it for debug/release as well. Change-Id: I6e02849d61d14a18375cf64a5990768931ebac48 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Unify win32-g++ and Unix qmake Makefiles.Ray Donnelly2013-02-191-5/+57
|/ | | | | | | | | Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Place libexec binaries into lib folder on WindowsKai Koehne2013-02-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default libexec directory to 'lib' on Windows for default configurations. This makes sure that e.g. qtwebprocess can actually find & load the right Qt libs. A separate libexec directory was introduced to avoid conflicts between a system-wide Qt in PATH and a custom Qt installation. However, since there are no system wide Qt installations on Windows this isn't an issue, but getting the executables to find its Qt libraries is. Alternatively we could have also placed it in the 'bin' directory. However, putting it in the 'lib' folder carries the notion that, unlike the binaries in the bin, the libexec executables might have to be deployed with a target application. The exception is when a separate archdata prefix is specified, and $$archdata/lib won't contain Qt libraries. In this case we use libexec like on the other platforms too. ChangeLog: [Qt for Windows] Fixed launching of QtWebProcess.exe by changing default libexec directory to 'lib'. Task-number: QTBUG-29661 Change-Id: Icbb15fb98474d6fef8ac9310f2e2b482d3282f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix module name format in displayed codeSze Howe Koh2013-02-111-5/+5
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtDBus -> Qt D-Bus QtMultimedia -> Qt Multimedia QtWidgets -> Qt Widgets Change-Id: I96a1523b37e294b10b203782074943c6ec55e34a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* avoid that we accidentally initialize XQMAKESPEC to an empty stringOswald Buddenhagen2013-02-011-5/+5
| | | | | | | | | there is plenty of tests which rely on the non-presence of the variable, rather than it being empty. Task-number: QTBUG-29400 Change-Id: Ifa8aa68192750521869767e2d4d3796794f4d8f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove somewhat pointless conditionalOswald Buddenhagen2013-02-011-2/+1
| | | | | | | if the user just set an empty spec, everything will go wrong anyway. Change-Id: I5ddaa2f0be1be96132260af8c869ba38e02eb3d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix minor typos in docs, printed messages & commentsSze Howe Koh2013-01-281-1/+1
| | | | | | | Missing apostrophes Change-Id: I3ef5e9d494fb7a37f8e6075f24cd3a274e572c23 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* configure.exe: Fix line feed characterDebao Zhang2013-01-251-8/+8
| | | | | | | | | config.summary has been opened in text mode, so the line feed character should be "\n" instead of "\r\n". Change-Id: Id73b0d698487cdd6f48902f3ae988c6a9fa59407 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Disable only accessibility bridge without dbus on linuxFrederik Gladhorn2013-01-231-2/+6
| | | | | | | | | | | | Keeping accessibility and only disabling the bridge will enable more builds to work. Warning about disabling accessibility disabled is needed because in QStyle it is used to discover semantics about widgets (if a toolbutton is in a toolbar). Change-Id: Iae4e6ab63479743bdd70cba4b1954ec7cf3f88e9 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1810-10/+10
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* add missing space in front of "directwrite" flagOswald Buddenhagen2013-01-111-1/+1
| | | | | | Task-number: QTBUG-28917 Change-Id: I8b86b96a3fb6b65f71aea6954ba8dfa520f5d909 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* configure: Remove left over for -nokia-developer optionSergio Ahumada2013-01-041-7/+0
| | | | | | | This seems to be a left over from 52fc6694b87e93fe0828424bb26d9279785de3e7 Change-Id: Ib0d5868a099e53ec2c2af6be749a5496bbf1f145 Reviewed-by: Jeremy Katz <jeremy@panix.com>
* slash the -fast configure optionOswald Buddenhagen2012-12-182-97/+2
| | | | | | | | | it's completely broken, and i have no time to fix it properly now. configure runs no qmake -r by default any more, so it's fast enough. Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Consistently prefix all platform plugin libraries with "q".Samuel Rødal2012-12-111-1/+1
| | | | | | | | | | | | | This means the xcb plugin library will be named libqxcb.so instead of libxcb.so, which doesn't clash with the system's libxcb.so. We need to consistently apply this on all platforms for static linking to work. Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.priMiikka Heikkinen2012-12-101-0/+3
| | | | | | | | | | | | | | | Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable to specify the default QPA plugin. "CONFIG += qpa_default_plugin" statement in application .pro file will add the default QPA plugin into QTPLUGINS. "CONFIG += qpa_minimal_plugin" statement in application .pro file will add the minimal QPA plugin into QTPLUGINS. Task-number: QTBUG-28131 Change-Id: I12a241005f30b37467d783b50f0369b47e605e68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure.exe: fix -inotify optionRafael Roquetto2012-12-061-0/+3
| | | | | | Change-Id: Iaa844961b5fdd2056fcc9b008c11a3f3925ca3a4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* use the same output dirs under windows as under unixOswald Buddenhagen2012-12-061-3/+3
| | | | | | | | the times when directory names starting with a dot were a problem under windows are sort of gone. for well over a decade. Change-Id: Ia1a0782c878a055cc5c094c6b3e4df0741368433 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move QT_{SOURCE,BUILD}_TREE back to .qmake.cacheOswald Buddenhagen2012-12-051-4/+2
| | | | | | | | | they cannot be legally used outside qtbase - it's the antithesis of modularization. Change-Id: I847844ea0ddce599f130f396d68cb61fa8f34135 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Moving the remaining variables assignments from .qmake.cache to qmodule.priAlexey Pavlov2012-11-301-3/+4
| | | | | | | | | | Moving variables to qmodule.pri allows to build all qt modules with user defined command line arguments passed to configure script. Task-number: QTBUG-27566 Change-Id: Ifa7991e9024df3fb4b1fd6536ee0d19b7c63d15e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* WINCE: Don't build angle by defaultAndreas Holzammer2012-11-301-1/+2
| | | | | | | | | | | | When having a directx sdk, angle does get auto enabled for all windows platforms. Windows CE directx builds on top of opengl es 2, so if there is directx, there is also a opengl es 2. So don't add more layers of indirection for Windows CE. As well angle does not build for Windows CE. Change-Id: I211a1de29431cd05d5cd60188f503d2cd299c9b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add a -libexecdir option to the configuresThiago Macieira2012-11-281-1/+13
| | | | | | | | | | | | | | | | | | User applications are those that users run directly, whether it be for development or not. The executable binaries that the user does not usually run but is still required for proper functioning are called "program executables" in Autoconf and they are placed in libexec. This commit adds support for "program executables" in Qt by adding the -libexecdir option to the configures, the qmake variable QT_INSTALL_LIBEXECS (note the plural, to match all other properties), and QLibraryInfo::LibraryExecutables. At the time of this commit, the only expected "program executable" is the QtWebProcess, the WebKit2 helper process from QtWebKit. Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add a new location for QML 2.x importsThiago Macieira2012-11-191-1/+14
| | | | | | | | | | | | | | | | | | | This commits adds a -qmldir configuration option for the configures to allow the user to change the default location (it defaults to $archdatadir/qml). It adds a QLibraryInfo::Qml2ImportsPath value for QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf configure location entry "Qml2Imports". At the same time, it makes the qmake .prf files dealing with QML plugins be the QML 2 version. Those files are new in Qt 5, so we have the option to choose which version we want to use. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure.exe: add inotify auto detection supportRafael Roquetto2012-11-161-0/+17
| | | | | | | | | This patch complements already existing functionality in the configure shell script. Change-Id: I09f4875cbe7ec60d36bb33774d28944a34cc8470 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add -archdatadir and change some of the default install dirs in Qt 5.Thiago Macieira2012-11-111-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Architecture-depedent Qt data defaults now to something under -archdatadir. Architecture-dependent data is everything that contains machine code (e.g., plugins) as well as anything that hardcodes build-specific data, like qconfig.pri and qmodule.pri. That is: QML imports: $archdatadir/imports (includes plugins) Qt plugins: $archdatadir/plugins (machine code) Mkspecs: $archdatadir/mkspecs (build-specific) Architecture-independent Qt data defaults now to something under -datadir. This option existed in Qt 4, but did not differentiate between arch-dependent and independent. Following Autoconf's lead, --datadir is the *independent* data root. translations: $datadir/translations (.qm files are arch-independent) docs: $datadir/doc By default, both new options are equal to the Qt install prefix. (Strictly speaking, for complete Autoconf compatibility, we'd need a --datarootdir=$prefix/share, --datadir=$datarootdir/qt5 and --docdir=$datarootdir/doc/qt5, but that's just nitpicking and unnecessary) Change-Id: I39c886a6a2d2d2c0b11923c50974179e21f2af76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Implement "-device" option for configure.exeRafael Roquetto2012-11-081-5/+31
| | | | | | | | This aims to mimics the behavior of the -device option already present on the configure shell script Change-Id: Ia28306f5ed74b9cfa812aa3efa6b79d0bafa4994 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: Pick up environment paths again on MinGWKai Koehne2012-11-071-4/+6
| | | | | | | | | | | Make sure that INCLUDE, LIB paths are again considered in configure checks on MinGW. While gcc itself doesn't care about the variables, qmake automatically adds them via -I, -L... This broke with 9c2ec72b95c13991f3. Change-Id: Ic6214eeea9eb7c92961c37c3aa76c4fcaddb22b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve Direct X SDK detection in configure.exeFriedemann Kleint2012-11-062-4/+88
| | | | | | | | | | | | | Check presence of Direct X SDK depending on compiler version. Check for presence of the headers d3dcompile.h and intrin.h (SSE2) as well as d3d9.lib and the shader compiler since the header d3dcompile.h is also present in MinGW. Change-Id: I7ee9701f4f9dc175ed2d733db79dda46de4d69f1 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* configure: Fix key prompt handling.Friedemann Kleint2012-11-051-18/+17
| | | | | | | | | - Introduce function for key prompt for usage in verifyConfiguration() and showLicense(). - Prompt only once in verifyConfiguration(). Change-Id: I7028da1bda703a424e39477bd06b2639475739a4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* configure: Use forward slashes in findFile-functions consistently.Friedemann Kleint2012-11-052-4/+4
| | | | | | | Convert to native where required. Change-Id: I11ff99ff9921bc470ebd804944e3b0773d49387c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Improve path search in configure.Friedemann Kleint2012-11-057-143/+183
| | | | | | | | | | | | | | - Remove duplicated code locateFile/locateFileInPaths. - Move basic path search functionality to Environment. - Add functions for headerPaths/libraryPaths to Environment. - Use QStandardPaths::findExecutable(). - Replace Environment::detectExecutable by QStandardPaths::findExecutable(). - Introduce static path lists in findFile() to avoid repeated directory scans Change-Id: I9b93066a3de65f40527780d6ddf7989bca35cd04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix "-no-opengl" configuration in WindowsMiikka Heikkinen2012-11-051-0/+1
| | | | | | | | | "-no-opengl" didn't clear the default value for "OPENGL_ES_2", which meant "opengles2" got configured in. Task-number: QTBUG-27840 Change-Id: Id7b8e3e268571d820bebfb3700d3961ec96be7fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* move invariant CONFIG flags out of the configuresOswald Buddenhagen2012-11-021-2/+1
| | | | | | | we now have qt_build_config.prf which can contain static code. Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move remaining configure'd CONFIG flags to qmodule.priOswald Buddenhagen2012-11-011-2/+2
| | | | | | | | so they are uniformly available to all modules. Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* rewrite default spec handlingOswald Buddenhagen2012-11-012-40/+11
| | | | | | | | | | instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Generate a .qmake.cache in config.tests from configure.exe.Jason Barron2012-10-303-0/+24
| | | | | | | | | | We need to generate a .qmake.cache file in the config.tests directory on Windows to ensure that the config.tests can actually be compiled before the qmodule.pri is created. Task-number: QTBUG-27708 Change-Id: I8d9397a8cbdb2aa19a5318497177d76049f9fa91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-301-1/+14
| | | | | | | | | | | | This option is opt-in (default: no). When configured with "-proxies-system-default", Qt automatically picks up the system proxies. Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add ANGLE as a 3rdparty library to Qt.Jason Barron2012-10-241-28/+32
| | | | | | | | | | | | | | | | | | | | | | | ANGLE is a component that implements the OpenGL ES 2.0 API on top of DirectX 9. See the following for more info: http://code.google.com/p/angleproject/ ANGLE is now the default configuration on Windows. If you want to use desktop OpenGL, you should build Qt with the following configure options: -opengl desktop To configure Qt to use another OpenGL ES 2 implementation, you should use: -opengl es2 -no-angle Task-number: QTBUG-24207 Change-Id: Iefcbeaa37ed920f431729749ab8333b248fe5134 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove Cleanlooks and PlastiqueJens Bache-Wiig2012-10-221-26/+0
| | | | | | | | | We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Rename the syncqt -qtdir to -mkspecsdirThiago Macieira2012-10-191-1/+1
| | | | | | | | | It's actually looking for the mkspecs (so it can read qconfig.pri to get the Qt version), so give it exactly what it wants. Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introduce new style FusionJens Bache-Wiig2012-10-181-0/+13
| | | | | | | | | | This is a new non-native style for Qt. It is intended as a replacement for the now aging Plastique and Cleanlooks styles. Change-Id: I30c0518a69e4e3b8b2b05ee7d84c3a5a1f307578 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* add a .qmake.conf file which load()s qt_build_configOswald Buddenhagen2012-10-181-2/+0
| | | | | | | | | | | | | | that way we don't have to auto-generate code for that in the configures. note that we now load qt_build_config.prf instead of just qmodule.pri, which means that exceptions_off is set everywhere. we forcibly re-enable them for testcases to minimize the deviation from default 3rd party usage. testlib selftests are not qt testcases, so the one that needs exceptions needs to enable them explicitly. Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix compile errors in configure.exe.Jason Barron2012-10-161-3/+0
| | | | | | | | | | | qstringmatcher.cpp and qchar.cpp are included in qstring.cpp and qunicodetables.cpp is included in qchar.cpp so these files should not be compiled as standalone objects. Change-Id: I323e0878af28b9e5fb2f659fb8077347b93fa439 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Modularize documenation buildTor Arne Vestbø2012-10-101-0/+7
| | | | | | | | | | qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global includes, instead of using relative paths. Qt modules will automatically get a doc target that builds and installs into the right place (including supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module). Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-10-041-0/+22
| | | | | | | Change-Id: Id0137400f18c8dfe7be7ca44670c16615401d424 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-012-0/+33
| | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5 Original-patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove CDE and Motif styles from qtbaseJens Bache-Wiig2012-09-271-29/+0
| | | | | | | | | | | | | | | | | It is time to clean up some of our legacy code. These styles have not been actively maintained for a long time and I think it is safe to say that they should no longer belong as part of the default distribution of Qt. We dont support any platforms based on CDE with our source packages. Note that even if we are removing these styles from the default distribution of Qt, applications that depend on them will still be able to bundle the existing (and unmodified) styles along with their own source code as we are not breaking compatibility. Change-Id: I1709630c20ba8e8088cd01628628d86856db57a4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Check in arch detection for qmake failuresAndreas Holzammer2012-09-271-2/+8
| | | | | | | | | QMake can fail at arch detection, so remove the silence here and fail when qmake does not produce any Makefile. Change-Id: I8826867952665a68f7205acf99ee6f1c9ead8513 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Configure.exe: Fix auto-detection of ICU for MinGWKai Koehne2012-09-271-1/+2
| | | | | | | | | | If one compiles ICU with MinGW the .lib files also have a lib prefix. Take this into account when checking for ICU availability. Upstream bug report: http://bugs.icu-project.org/trac/ticket/9603 Change-Id: Ia1ca49053b0ab41de45eec13799d94d5e934c42e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* configure.exe: Don't print warning about -c++11 option by defaultKai Koehne2012-09-271-0/+5
| | | | | | | | | Make sure that defaultTo() and therefore autoDetect() actually keep the "auto" setting for MSVC. We check for this later on in verifyConfiguration. Change-Id: Iebf1ef415161a09bbc871baa31ff9dc56d54acac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 11:13:54 +0000