| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits)
Whitespace change
Fix for coding conventions.
Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
Assistant: Get rid of bogus warning.
add missing license header
Add inter-process binary shader cache for MeeGo
Track average wait times under our maximum spin time threshold
Store and track spin times in nanosecond resolution
Optimize adaptive spinning mutex code
Improve QMutex contention performance on Linux
Improve QMutex contention performance on Mac OS X
Disable spinning under lock contention on single CPU machines
Remove unnecessary testAndSetAcquire from QMutex::lockInternal()
Move contender count maintenance to QMutexPrivate
test contention when using 2 mutexes
Ensure that every thread does contend in the contention tests
Add baseline test data to measure test overhead
Test contention performance for long (10ms) critical sections
Add a benchmark for contended and uncontended QMutex performance
...
|
| | |
| |
| |
| |
| | |
Since I can't touch merge requests, this is a separate commit to fix
whitespace errors in code.
|
| | |
| |
| |
| |
| | |
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| | |
CID 22165.
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| | |
CID 22164.
Merge-request: 2534
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | |
| |
| |
| | |
Task-number: QTBUG-16096
|
| |\ \
| |/
|/|
| |
| |
| | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| | |
| |
| |
| |
| | |
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tested on OS X Snow Leopard with libusb-0.1.12.
The devices are named /dev/cu.usbmodem<opaque id><interface number>,
where the opaque id doesn't seem to be available via the current
libusb interface, but finding it would require usage of native OS X APIs.
The interface number is available at least, and searching for
cu\.usbmodem.*<interface number> as a regexp finds the right devices as
long as not too many devices are connected.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | |
| |
| |
| |
| |
| |
| | |
In some occasions (encountered on OS X), this can be null for some devices.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Absolute include path breaks QtP releases which copy mkspecs under
epoc32 and do not necessarily have the sources available in the
original absolute path and can't patch the paths either at
installation time.
Task-number: QTBUG-16172
Reviewed-by: Oswald Buddenhagen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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: (218 commits)
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
Update def files
Fix tst_QFile::caseSensitivity test on Mac
Fix typo in QFile test
Add test generated files to .gitignore
Fix compile error for qdir autotest on symbian3
QtDeclarative: make autotests compile on symbian
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master's version of conflicting def files picked.
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/s60installs/bwins/QtCoreu.def
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
qmake/Makefile.win32
qmake/qmake.pri
src/corelib/io/qdir.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/io/qfileinfo_p.h
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/tools/bootstrap/bootstrap.pro
tests/auto/qfileinfo/tst_qfileinfo.cpp
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The search is implemented using FindFirstFileEx(). Following
optimizations are done
* Using large Fetch buffer on Windows 7
* Querying only the long file name
* Querying for directories only, depending on QDir::Filters
Reviewed-by: Joao
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Only stubs, for now, but it's a start.
Reviewed-by: Thomas Zander
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: João Abecasis
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Since we're refactoring code out of QFSFileEngine the new internal
classes have to be compiled in together with the old engines.
For the time being, we'll assume Mac uses the unix version of the
engine. We'll fork those only if and as needed.
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits)
Add expected failures for JS test suite on Symbian
Ensure ListView contentHeight is set to a valid size.
Revert "Add mirroring-positioners.qml example" that was accidentally pushed
Fix dragging Flickable back over start point.
Add mirroring-positioners.qml example
A QAIM model resulted in items moving to incorrect locations
Build on Symbian
refuse to open empty translation files
fix path separator matching
fix -dont-process for mingw cross-build
fix nonsense condition
Fix qwidget test crash
QmlViewer: Remove trailing whitespace
QmlViewer: Remove trailing whitespace
QmlViewer: Fix crash on exit
Don't include <features.h> directly: non-standard header.
Remove superfluous OpenGL linking for QtDeclarative
Corrected case on Symbian library.
Missing glyphs in GL when scaling QStaticText and QML text items
PathView: removing the currentIndex could make it invalid.
...
|
| | |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/
| | |/| | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Michael Brasser
|
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlViewer: Remove trailing whitespace
QmlViewer: Remove trailing whitespace
QmlViewer: Fix crash on exit
PathView: removing the currentIndex could make it invalid.
Fix broken database creation caused by previous fix
Improvements to anchoring docs
QDeclarativeProperty doc improvements
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
We can't use atexit() handler to show a warning, since whether the
QApplication object then still exists or not is undefined.
Instead, call the method directly where it makes sense (warnings about
command line arguments etc).
Task-number: QTBUG-15740
Reviewed-by: Thomas Hartmann
|
| | | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
they cause a crash. fixing it properly would be in no reasonable
relation to the gain (none whatsoever), so just forbid it.
yes, this breaks the message freeze ... big deal in a translation
application. ;)
Task-number: QTBUG-14574
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-14736
Reviewed-by: Alessandro Portale
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
based on merge-request 960 by Robin Helgelin
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (101 commits)
Fix QTextEdit::selectAll crash from textChanged()
Fix proxy reading from gconf so that it is only done once / session.
rebuild configure
fix misleading uppercasing deprecation warning
Enable Phonon on Symbian by default.
Disable OpenGL on Symbian only by default instead of always
VFP type on ARM option in Linux configure script
Adding -dont-process option to Unix configure script
Synchronized configure.exe OpenGL options with Unix configure
build lrelease as part of the "libs" part.
purge vestiges of imageformat-plugins
Unify epocroot usage in createpackage and patch_capabilities scripts
Update visual tests for the recent qmlviewer change
Do not use openGL on Mac OS X for QML visual tests
Give qmlviewer a minimum size if root object has no size.
Add 'Writing New Components' docs, and document the connect() function.
Mention that image providers should be added before loading QML files
Update QML visual tests
Cleaned up sis_targets.prf
Append qml import path individually for each available drive on Symbian
...
|
| | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| | | / / / / / / /
| | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Windows configure tool and Linux configure script use different options for OpenGL modules.
Windows configure tool uses -opengl-es-cm and -opengl-es-2.
Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common.
Windows configure tool is changed to understand Linux OpenGL configure options as well.
The old options are retained for compatibility but not documented any
more.
Reviewed-by: ossi
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The imageformat-plugins variable is never referenced by the .pr[io] for
building Qt. Its presence in configure.exe appears to be a vestige of
an earlier state of affairs.
As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built
as plugins. The default is plugin. During configuration, this can be
overridden by adding, for example, "no-jpeg" to disable support
altogether or "jpeg" to build into QtGui.
Merge-request: 961
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 ensured the window was at
least partly visible on Windows and Linux but it did not work on Mac.
Task-number: QTBUG-15783
Reviewed-by: Alan Alpert
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-15720
Reviewed-by: Martin Jones
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Trust Me
|
| | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Disable sub-pixel antialiasing and skip text on 10.5
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTCREATORBUG-825
|
| | |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This merge consists of the actual kinetic scroller implementation, its
autotests plus a few examples. QAbstractScrollArea and QAbstractItemView
have been extended to support the new scroll events.
The complete history is in
http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture
(part 2 is the QML Flickable replacement / part 3 is QWebView support)
Task-number: QTBUG-9054
Reviewed-by: Ralf Engels
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Juuso Pakarinen <juuso.pakarinen@tieto.com>
Task-number: QT-4341
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task: QTBUG-15676
|
| |\ \ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
|
