| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
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
|
| |
|
