| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Merge-request: 707
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
To resolve the header file conflict as described in QTBUG-10647, we
* remove include/Qt/private
* "syncqt -copy" creates in include/Qt local forwarding headers
instead of header file copies
In case of a conflict, e.g. qxmlstream.h, we include both header files.
All header files in include/Qt now yield a preprocessor warning, if
they're included. They should not be used and will vanish some day.
Task-number: QTBUG-10647
Reviewed-by: ossi
|
| |
|
|
| |
This file originally used tabwidth of 8.
|
| | |
|
| |
|
|
| |
Reviewed-by: Dmytro Poplavskiy
|
| | |
|
| |
|
|
|
| |
Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-4586
|
| |
|
|
| |
Reviewed-by: TrustMe
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits)
Expect fail.
Expect fails.
Attempt to clairify highlight range docs
Make sure item release isn't deferred indefinately
Expect fail.
Missing file
Exclude plugins example in test.
Test
Crash
Fix tests
Compile.
Remove pathview test.
Remove unneeded
Fix repeater test.
Revert "Remove unimplemented methods from header"
Revert "Replace QList<>* support with QmlListProperty"
Revert "Compile"
Add expected fail and created QTBUG-8072 for qml animation auto-test
Fix expected error message.
Consolidate the two pathview tests and fix them all.
...
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic
Conflicts:
src/xmlpatterns/type/qprimitives_p.h
tools/linguist/lupdate/main.cpp
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
kinetic-declarativeui
Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
.gitignore
tests/benchmarks/benchmarks.pro
|
| | | | | |
| | | | |
| | | | |
| | | | | |
mkpath( $dir, $verbose, $mode )
|
| | | | | | |
|
| | | | | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/corelib/kernel/qobject_p.h
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
kinetic-declarativeui
Conflicts:
mkspecs/features/qt.prf
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qparallelanimationgroup.cpp
src/corelib/animation/qpauseanimation.cpp
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qsequentialanimationgroup.cpp
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qeasingcurve.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/opengl/opengl.pro
src/opengl/qgl_x11egl.cpp
tests/auto/auto.pro
|
| | | |/ / / / / / / |
|
| | | / / / / / / |
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/kernel/qcocoapanel_mac.mm
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-7891
Reviewed-by: Kurt Korbatits
|
| |\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Changed the syntax to allow for the situation where the .pro file is in
a different directory than the header files to install. In this case the
resulting Makefile is in WebCore/Makefile, so the references in headers.pri
to for example qwebview.h has to be ../WebKit/qt/Api/qwebview.h.
This doesn't affect any existing syncqt operations inside of Qt.
Reviewed-by: Trust me
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added a -separate-module commandline option to syncqt that allows calling
syncqt from outside of Qt to create header files.
For WebKit package we call syncqt with -separate-module QtWebKit:WebKit/qt/Api
to generate headers for the "QtWebKit" module for the headers in
WebKit/qt/Api/*.h
Reviewed-by: Thiago
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This removes the need to set the QTDIR environment variable and
makes it possible to call syncqt conveniently when creating webkit
packages.
Reviewed-by: Thiago
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Restore original Qt 4.4 behaviour. The capital P headers are not
correct because of frameworks on Mac.
More info, see thread:
http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2
Task-number: QTBUG-4685
Reviewed-by: Trust Me
|
| | | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
LoadLibraryW -> LoadLibrary
RegOpenKeyExW -> RegOpenKeyEx
qdesktopservices_win.cpp: buffer size fixed in launchWebBrowser()
Windows NT 4.0 version condition removed
Merge-request: 1627
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/corelib/io/qfsfileengine.cpp
src/network/access/qnetworkrequest.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Many Qt autotests require both private symbols and private headers.
Private symbols are turned on using -developer-build.
However, prior to this commit there was no way to install private
headers into the Qt install directory.
This is particularly relevant for packaging systems which use `make
install' to determine what should be packaged. For example, Qt for
Maemo debian packages are effectively unusable for Qt autotests
without this commit.
Reviewed-by: Michael Goddard
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
|
| | | |_|_|/
| |/| | |
| | | | |
| | | | | |
Does nothing if no declarative directories installed.
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/qt4-intro.qdoc
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Syncqt was relying on the order that headers appear in the filesystem.
That order is effectively non-deterministic, meaning that the files
generated when running syncqt on different copies of the same source are
very hard to compare.
For example, when generating source packages for the same sha1 twice in
a row, you would expect to get identical source packages, but you don't
because each packaging run downlaods the source tree from git, thus
randomizing the order of files on the filesystem.
This commit forces syncqt to be deterministic by making it sort each
directory it reads before it processes the directory.
On a side note: syncqt should probably be using Perl's File::Find
function instead of recursing through directories itself.
Reviewed-by: Lincoln Ramsay
|
| | | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This introduces an undocumented "phonon_compat" subdir and also adds
it to the INCLUDEPATH when QT += phonon is specified. With this, these
styles of #includes should be supported:
#include <Phonon>
#include <Phonon/Phonon>
#include <phonon>
#include <phonon/phonon>
#include <Phonon/MediaObject>
#include <phonon/mediaobject.h>
Still need to check if the headers get installed during "make
install". I couldn't find where in our code that is done.
BT: yes
Reviewed-By: Trust Me
|
| |/ / / |
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is the long-standing issue of whether Phonon headers should be
written with a capital P or a lowercase one. KDE releases of Phonon
had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>.
I tried to solve this before by adding a Phonon subdir next to phonon
in include/, but that only compounded the error: the presence of two
dirs caused problems and the installation wasn't fixed.
So instead try to place Phonon/ClassName inside include/phonon. And
fix the installation to do it properly: just copy the include/$lib dir
into the target, then overwrite the .h files with the sources from
src/$lib.
Reviewed-by: Marius Storm-Olsen
|
| |/
|
|
|
| |
This change also moves the EGL support classes from QtOpenGL to QtGui
so they can be shared between OpenGL and OpenVG.
|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
