| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
See d4150975af620e2889cc58bd476bac6b4d101db3
|
|
|
|
| |
Reviewed by: Andreas Kling
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
after change 0c7d5d10615, "Symbian: Disable IPv6 for now"
|
|
|
|
| |
Reviewed-by: trustme
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
Reviewed-By: Alessandro Portale
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: mauricek
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Also, rebuilt configure.exe
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| | |
the option given in the note would not work if used as described.
Reviewed-by: Zeno Albisser
Task-number: QTBUG-2089
|
|/ |
|
| |
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Rohan McGovern
|
|
|
|
|
|
|
| |
If the user tells configure not to compile QtScript, then fail if
the user wants QtDeclarative or QtScriptTools
Reviewed-by: Jørgen Lind
|
|
|
|
| |
Commit ad341d61 seems to have integrated a configure.exe from 4.6.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8562
Reviewed-by: ossi
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
|
| | | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-8562
Reviewed-by: ossi
|
|/ |
|
|
|
|
|
|
| |
This version of configure.exe was compiled with MSVC 9.0.
Reviewed-by: Miikka Heikkinen
|
|
|
|
| |
Reviewed-By: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug where all target types, including apps, plugins and static
libraries were getting DEFFILE statements - now it's just libraries that
get it.
Fix bug where duplicate DEFFILE blocks were being added to projects that
manually specified their own DEFFILE - this now tests for the qmake
variable "defBlock" being set, and doesn't add additional DEFFILE
statements if it is.
NOTE: This means that adding DEFFILE statements to MMP_RULES
manually should be done by creating a variable called defBlock, and
adding that to the MMP_RULES (ie. MMP_RULES += defBlock)
Fix bug in configure.exe, where using -nokia-developer for Windows builds
would warn about Symbian DEF file usage (or lack thereof)
Reviewed-by: Janne Koskinen
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
|
| |
RVCT2.2 build 686 crashes when compiling the drawhelpers with
VFPv2 enabled. Until compiler workaround found, back out the
change.
This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37.
Conflicts:
configure.exe
|
|
|
|
|
|
|
|
| |
Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian
specific section of configure
Task-number: QTBUG-6556
Reviewed-by: Simon Hausmann
|
|
|
|
| |
Reviewed-by: Aleksandar Sasha Babic
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to
see if DEF files were enabled, when setting the DEF file path
Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was
defined when testing for its value, due to incorrect use of
QMap::operator[]
Tidy up configure.exe help for new def files option
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
Reviewed-by: Janne Koskinen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Provide configure flag to enable/disable the use of DEF files on Symbian.
A useful side-effect was that it cleaned up how we control DEF files from
qbase.pri and in WebKit.
-nokia-developer still disables DEF files, as it triggers the autotest
exports, which are not frozen into the DEF files.
Disabling DEF files means that there is no BC with previously released
versions of Qt, so this should only be used for development purposes.
.pro files can specify custom locations for DEF files by setting
defFilePath.
Task-number: QTBUG-6556
Reviewed-by: Jason Barron
|
|
|
|
|
|
|
|
|
|
|
| |
This avoids two sets of --fpu flags being passed on the compiler command
line, so we don't have to worry about which takes precedence (especially
since it varies between RVCT and GCC).
Putting ARMFPU in the MMP file means that the toolchain will replace its
default option with the one we specify instead.
Reviewed-by: Aleksandar Sasha Babic
|
|\
| |
| |
| |
| | |
Conflicts:
configure.exe
|
| |
| |
| |
| |
| |
| | |
Allow better control over audio backend used.
Reviewed-by:Justin McPherson
|
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| |
| | |
there were several changes made to configure.exe recently, this commit
makes sure we have rebuilt the binary after all the changes have been
made.
Reviewed-by: Thiago Macieira
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
before, when configured with -openssl-linked, configure.exe hang,
because of the following:
We were checking for XQMAKESPEC via something like
'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC
value to the dictionary. Later (line 3030), we checked whether
XQMAKESPEC was set (which was now true), and we used the value although
it was empty.
Reviewed-by: Thiago Macieira
Reviewed-by: Denis Dzyubenko
|