| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits)
Fix warnings, whitespace cleanup
Don't rely on uninitialized data
Doc: Fixing typo
Doc: Fixing typo
Skip failing tests
Use effective user id instead of getlogin
Fix compile error in tst_qfileinfo on Mac/Linux
Fix tst_QFileInfo owner() & group() failure on Windows.
Fix tst_QFileInfo::canonicalFilePath failure on Windows
Fix QDir::relativeFilePath
Fix spelling in comments
Add missing license header to test case
Define _WIN32_WINNT before any includes
New attempt at fixing compilation failure
Removing unused duplicate definitions
No symbolic links in Windows CE
Set minimum target Windows version to 2000
More missing includes
Add missing include
Fix compile error
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Due to the change from default deployment in symbian from being hardcoded
in qmake to being in default_deployment.prf the .pro files needed to be
changed.
Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise
the default deployment lines are not added and the test won't install.
Reviewed-By: Miikka Heikkinen
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |/
| |
| |
| | |
Task-number: QTBUG-13719
|
|/
|
|
|
|
|
|
|
|
| |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
|
|
|
|
| |
Task-number: QTBUG-9491
Reviewed-by: Martin Jones
|
|
|
|
|
|
| |
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
|
|
|
|
| |
QTBUG-9726
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/declarative/qdeclarativeecmascript/testtypes.h
|
| | |
|
| |
| |
| |
| | |
Task-number: QTBUG-8590
|
|/ |
|
|
|
|
|
|
| |
property
QT-2793
|
| |
|
| |
|
|
|
|
|
| |
Conflicts:
src/declarative/qml/qdeclarativeproperty.cpp
|
|
There's nothing meta about our properties.
|