| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Adds mkspecs and a qmake generator for Green Hills .gpj files
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add autotest for QScriptExtensionPlugin
Improve QtScript test coverage
Don't crash when null-pointer is passed to qScriptValueFromValue()
Simplify object lifetime management when moving objects to a QThread
samegame: white space
Move list of trusted benchmarks out of QA dungeon and into Qt
Don't put Objective-C sources in SOURCES
mkspecs: Emit warning when including g++.conf directly
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
86636e0c4ab91bfb6 refactored the mkspecs, but didn't account for people
with their own mkspec who would still include g++.conf directly. We now
print a warning if this situation is detected, and explain to the user
how they can fix their mkspec.
For convenience we redirect g++.conf to g++-unix.conf so that people's
mkspecs will still work.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/egl/egl.pri
src/gui/painting/qwindowsurface_p.h
|
| |
| |
| |
| | |
Reviewed-by: joerg
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
the unix makefile generator can make files for "regular" unixes and
macos (the difference being the framework handling). so far, the output
choice was hard-wired to the host platform. the previous commit made
that soft-configurable, and this one exploits this capability to enable
limited cross-building.
Reviewed-by: mariusSO
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
doc/src/deployment/deployment.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/xml/qxmlstream.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1875
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.cpp
src/gui/dialogs/dialogs.pri
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
|/ |
|
|
|
|
| |
Fix a typo, update the tmp path to match current qws behavior.
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
This makes Qt work on QNX 6.4.
* no q3support, no phonon
* no QSharedMemory, no QSystemSemaphore, no QProcess
Reviewed-By: Robert Griebl
|