| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure
configure.exe
src/gui/kernel/qaction.h
|
| | |
| |
| |
| | |
Reviewed-by: mauricek
|
| | |
| |
| |
| |
| |
| |
| | |
Added qtextcodec and qutfcodec to bootstrapped applications (checksdk
and configure)
Reviewed-by: trustme
|
| |\ \
| |/
| |
| | |
kinetic-declarativeui
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
phonon backend:
- mention the DirectShow SDK, not the DirectX SDK (which doesn't include DirectShow anymore)
- mention which exact files were not found, rather than just "all required files couldn't be found"
Merge-request: 881
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| | | |
|
| | | |
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
-developer-build, part 1.
Adds QT_CONFIG+=private_tests to qconfig.pri when Qt is configured
with -developer-build.
Reviewed-by: Michael Goddard
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/sql/drivers/ibase/qsql_ibase.cpp
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qsqldatabase/tst_databases.h
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
translations/qt_ru.ts
|
| | | |
| | |
| | |
| | | |
Reported via qt-bugs
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent_p.h
tools/qdoc3/codemarker.cpp
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/generator.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| | | |
| | |
| | |
| | |
| | |
| | | |
when paths to the ActiveSync headers/libraries are not set up.
Reviewed-by: Michael Goddard
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
The configuration option was not added to the Windows configure.
Reviewed-by: hjk
|
| | | |
| | |
| | |
| | | |
(moc, uic etc) fails.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it simply breaks too much (embedded builds in particular).
will come up with something better in master.
note however, that the .qm files do NOT return to the repository. the
release manager needs to run "make qm" before packaging, just like
Qt-from-git users who want translations do (i.e., almost nobody).
Reviewed-by: Jason McDonald
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
so "qmake -r && make" worked fine ... but configure does not simply run
"qmake -r".
also, now we have to build lrelease even when we don't build the other
tools.
Reviewed-by: Jason McDonald
Reviewed-by: mariusSO
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
tools/qdoc3/htmlgenerator.cpp
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/selftests/expected_skip.txt
tests/auto/selftests/tst_selftests.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 254451
Reviewed-by: eskil
BT: yes
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
tools/qdoc3/doc.cpp
|
| | |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Additionally we turn -ltcg on by default on Windows CE.
See commit 56191830 for details.
Reviewed-by: mauricek
BT: yes
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsscene.cpp
|
| | |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tools/macdeployqt/shared/shared.cpp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Turning on LTCG affected too many projects, where customers applications
would take a long time linking, severly affecting their development time
(even though it was only added for release builds)
We turn it off by default, and add a -ltcg configuration option, and the
possibility to also do CONFIG+=ltcg in projects, should they not want it
for Qt, but in their own projects. (Same, they can build Qt with it, and
do CONFIG-=ltcg for their project)
Reviewed-by: andy
|
| |\ \ \
| |/ /
| | |
| | | |
kinetic-declarativeui
|
| | |/ |
|
| |/ |
|
| |
|
|
|
|
|
|
| |
Reviewed-by: Thiago
- display the nokia internal usage text like on configure
- instead of skipping the license check we need to actually call it to
set QT_EDITION and friends properly. Otherwise the build gets broken.
|
| |
|
|
|
|
|
| |
A Nokia build doesn't require a license.
Reviewed-by: mauricek
BT: yes
|
| |
|
|
|
| |
RevBy: Joerg
Details: -opengl-es-2 option for configure.exe
|
| |
|
|
|
| |
Reviewed-by: TrustMe
BT: yes
|
| |
|
|
|
|
| |
These were reported by mkdist
Reviewed-by: TrustMe
|
| |
|
