| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Relies on hard-coded paths, and is no longer used/maintained.
|
|\ |
|
| |
| |
| |
| |
| | |
When it's deployed across multiple devices, there is no 'standard' grid
size. This allows non-desktop versions to display high scores.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
from secondary thread.
It is well known fact that CEikonEnv::Static() will return NULL from
secondary thread. This means that accessing QDesktopServices from
secondary thread will cause crash.
Example for this is qmlviewer, where there is separate thread that
handles .qml files.
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
This commit should make declarative compile against 4.6.2 again.
|
| |/
| |
| |
| |
| |
| |
| | |
Was accidentally ignoring key movements even when an existing selection
meant that pressing right/left would do something.
Task-number: QT-2944
|
| | |
|
| |\ |
|
| | |\ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
is started. Also fix some memory leaks.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
'Better' layout mechanics, included animated resize for those people
with long names.
|
| | | |
| | | |
| | | |
| | | | |
Perhaps instead, such 'private' property types should be registered by the using class?
|
| |_|/
|/| |
| | |
| | |
| | | |
Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange()
notification. That seems wrong, but this change is a work-around.
|
|\ \ \ |
|
| | | | |
|
| | | | |
|
| | | | |
|
|/ / / |
|
| |/
|/| |
|
| |
| |
| |
| | |
Remove unneeded .moc imports resulting from moved classes.
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove noop code
Move type initialization from global static initializers to QmlEngine construction.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (85 commits)
Add make stub_sis target, and add webkit stub to qt.iby
Fix to S60 softkeys when no active Qt window or native widget is shown.
doc: Fixed several typos.
Doc: remove \preliminary tag from public multimedia classes
Fixed the perl download link and description in docs
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again
QNAM HTTP: Optimize detectPipeliningSupport()
QNAM HTTP: Set channel to IdleState at better place
QXmlSchema: fix crash in schema parser
We need to export qBadAlloc() on all platforms
now really fix the message editor for dark backgrounds
Revert "(ODBC) Use wchar_t instead of assuming 2 bytes."
Update Symbian DEF files
Export a function to get dfb-surface from a pixmap
Fix the WebKit build
Blinking cursors are 2 pixels wide on Mac OS X/Cocoa.
Fixed compilation with QT_NO_WHEELEVENT
Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
Fixed drawing QPixmaps on QGLWidgets on different X11 screens.
Take into account the solaris-cc-64-stlport mkspec
...
|
| | |\ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Refactor font and zoom handling, reduces clutter in central widget.
Some more refactoring.
Move the QWebView based help viewer into it's own source files.
add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs
use variables from the spec instead of hard-coding platform ifdefs
move $(DEL_FILE) 2> NUL redirection into .conf file
fix host platform conditional
purge msvc.net and msvc2002 makespecs. unsupported for a while now.
purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.
remove weird -tp ce matching line nobody can say anything about
remove remainder of mac9 mode
remove the most blatant tmake compat paths
simplify
add qt5 todo
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: ck
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move the QTextBrowser based help viewer into it's own source files
and introduce a common base clase that currently only contains the
statics, but more to come for common stuff.
Review: ck
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
littering generic makefile generator code with it is both plain ugly and
unnecessary.
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Suggested-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Acked-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
no need to recalculate a value which we have an own variable for
Reviewed-By: mariusSO
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: mariusSO
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add make stub_sis target, and add webkit stub to qt.iby
Fix to S60 softkeys when no active Qt window or native widget is shown.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
| | | | | |\ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix to S60 softkeys when no active Qt window or native widget is shown.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Softkeys need to be updated also when Qt activewindow is set to NULL,
this is needed that usecase where last Qt widget is closed works
correctly. I.e. closed widget softkeys has to be removed, and replaced
by default "Exit" softkey. Earlier only window activation or widget
focusIn event caused softkey update.
In addition IsDisplayingMenuOrDialog does not work correctly under all
circumstances. Sometimes when menu is being launched the Qt gets
focusChanged event before the menu is actually shown, but menu CBA is
already created. This is fixed by checking that we update CBA only when
AppUi CB is the current one. This assumption works as long as Qt uses
only the CBA created by S60 application framwork and does not create
other CEikButtonGroupContainer instances.
Task-number: QTBUG-6115
Reviewed-by: Sami Merila
|
| | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Fixed several typos.
Doc: remove \preliminary tag from public multimedia classes
|
| | | | | |\ \ \ \ |
|
| | | | | |/ / / /
| | | | |/| | | | |
|
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task: QTBUG-7997
|