| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
583f6e1: Disabling largefile support for WinCE
2bba0ea: Avoid macro re-definition after 65bd0bd1f04
45a277c: Fix url about evaluation license
e80d7bb: unmess CONFIG/QT_CONFIG static/shared
e5735c9b: Update copyright year in Digia's license headers
f7e9417: fix -inotify option
e5e5238: add inotify command line switch
69b918f: Fix syntax error on configure.exe source code.
deca010: Use slogger2 for logging on Blackberry instead of writing to stderr
Change-Id: I5ed9540aa3841be05926669cdc40afd608f69a37
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598
Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
| |
d7e922e6: QtNetwork: introduce configure switch to use system proxies by default
343f559b: Support other platform names on configure.exe
Change-Id: I2fc57d4ce36469bfe2b7c088375371d229bf8c7d
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
| |
Change-Id: I97c71a3f9a2190edeac7c21f873b1140729e3d81
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
| |
... again.
Change-Id: I0b36c25373bdb3842dd41df598804310e502acb1
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I4dbe8cb9b777b141e9e147277c7a424739d40926
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Iecd72971c2cb825cfb4d1ab3c0110feb9df1f854
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
|
|
|
|
|
|
| |
Built from: 07f5ae8648f1b619ccb55989745fc44088a62685
Change-Id: I7d06600a76f9d88488e092df9dabcc8aa8f1187a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
| |
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
|