| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Prepended QT_ to a define we use internally in fixed_stdlib.h
Reviewed-by: Janne Anttila
|
| |
|
|
| |
Reviewed-by: TrustMe
|
| |
|
|
| |
RevBy: Trust me
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlineedit.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qmultiscreen/qmultiscreen.pro
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qresourceengine/tst_qresourceengine.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
|
| | | |
|
| | |
| |
| |
| |
| | |
This takes advantage of new functionality in RVCT 2.2, and requires
build 683 beta or later.
|
| | |
| |
| |
| | |
RevBy: Trust me
|
| | |
| |
| |
| | |
RevBy: Trust me
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
WebCore.pro's generators use QMAKE_DEL, which when used with del.exe
works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL
is mapped to rm, which complaints if the file to delete doesn't exist.
Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL
in the QMAKE_SH branch.
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
| | |
| |
| |
| |
| | |
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task: 242139
This commit replaces Symbian specific 'depends' keyword in qmake
DEPLOYMENT variable with two more generic ones. The new keywords
are 'pkg_prerules' and 'pkg_postrules', and they allow developer to
pass raw data to PKG file. The strings in 'pkg_prerules' are added
before PKG file package-body headers and 'pkg_postrules' after them.
Correspondingly as old 'depends' keyword, the new keywords are not
parsed by qmake, so they must be in a format understood by Symbian
package generation tools.
Note that 'pkg_prerules' can also replace default language,
package-header and vendor statements in pkg file. If you decide to
override any of these statements, you need to pay attention that
also other statements stay valid.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is more a cleanup of the usage of Q_WS_S60 vs. Q_OS_SYMBIAN than
anything else. One of the side effects of this work was that it was
relatively little work to get QtGui compiling when Q_WS_S60 is not
defined.
Based on this we introduce two new configure options that control S60
integration. Currently the -no-s60 option will not work entirely
because the 's60main' module has not yet been refactored and still has
a dependancy on the S60 libraries.
Reviewed-by: axis <qt-info@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The EGL code is now a part of QtGui so QtOpenVG doesn't need to link
against it anymore. This also removes the need to link against cone
since we don't need to call DrawableWindow() from the OpenVG code.
We add the EGL library to a separate variable which is then used when
QT_CONFIG contains the "egl" feature.
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
configure.exe
src/corelib/concurrent/qtconcurrentthreadengine.h
src/corelib/global/qnamespace.h
src/gui/graphicsview/qgraphicssceneevent.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qapplication_qws.cpp
src/gui/kernel/qwidget.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkaccesshttpbackend.cpp
tests/auto/network-settings.h
tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
tests/auto/qvariant/tst_qvariant.cpp
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The GCC-LLVM compilers on Snow Leopard have advanced enough
to make them worth the effort to make sure they at least work again.
These are the minimum changes needed to make things work. The current
gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to
special case them anymore either. You STILL need to make sure your path
is correct however.
Reviewed by: Morten Sørvig
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
ShivaVG runs on top of OpenGL. Include the QMAKE_*_OPENGL flags
on the link line if it is needed by the OpenVG engine.
Reviewed-by: trustme
|
| | | |
| | |
| | |
| | |
| | | |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bring Qt 4.6 into the Qt-S60 repo.
Conflicts:
configure.exe
mkspecs/features/qttest_p4.prf
qmake/generators/makefile.cpp
src/corelib/io/qdir.cpp
src/corelib/io/qprocess.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/corelib/thread/qthread_p.h
src/corelib/tools/qvector.h
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qmessagebox.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/image/qpixmapcache.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qmenubar.cpp
src/network/socket/qlocalserver.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qpixmap/qpixmap.pro
|
| | |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Qt itself was O2 from 4.2 and up, this changes it for applications as well.
Reviewed-by: nrc
|
| | / / |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Earlier used CSendUi required extensiva capabilities to work correctly,
that's why "new email" option in desktop services example application
did not work correctly with self signed capabilities.
RSendAs requires lower capabilities since SendAs server (separate
process) takes care of necessary actions to send the message.
|
| |\ \ \ |
|
| | | | | |
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Additionally we turn -ltcg on by default on Windows CE.
See commit 56191830 for details.
Reviewed-by: mauricek
BT: yes
|
| | |/
|/| |
|
| | |
| |
| |
| |
| |
| |
| | |
This reverts commit c33abd370470a0097cc1fbb858e1218ba110e0df.
We will need this patch in the end, but right now it's causing too
much trouble with the compiler. To return soon!
|
| | |
| |
| |
| |
| | |
This takes advantage of new functionality in RVCT 2.2, and requires
build 671 beta or later.
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d
Task-number: 253052
Reviewed-by: Norwegian Rock Cat
Reviewed-by: MortenS
|
| | |
|
| | |
|
| | |
|
| |
|
