| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Only complete if there is a text to complete
Reviewed-by:janarve
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Avkon dependencies can be configured out with the -no-s60 configure
flag, conversely Qt on Symbian will use Avkon if -s60 is configured.
These changes are intended to keep or introduce binary compatibility
between the s60 and no-s60 configurations. To do this, it has been
necessary to introduce stub equivalents of the CAknAppUi related
classes into the no-s60 configuration, and override all Avkon framework
virtual functions in the QS60Main... classes.
Other than that, these changes are mostly just correcting the use of
the Q_WS_S60 flag so that it only refers to Avkon dependencies.
Reviewed-by: Sami Merila
|
|
|
|
|
|
|
|
| |
Add QSystemTrayIconPrivate::supportsMessages_sys() method
Report support for balloon messages only when they are actually allowed ("EnableBalloonTips" registry value)
Merge-request: 2355
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
| |
Merge-request: 2355
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|
|
|
|
| |
Merge-request: 2355
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
|\ |
|
| | |
|
| |
| |
| |
| |
| |
| | |
Patch providedin the task.
Task-number: QTBUG-8407
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| | |
The desktop Windows and Windows CE code paths diverged too much.
Splitting it up now and making it work on WinCE again.
Task-number: QTBUG-4828
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Always prefer the bottom area for the list popup - if that doesn't work out
use the maximum available space (top or bottom) and resize the popup if
it still does not fit.
RevBy: Dominik Holland
RevBy: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
When configuring Qt to be in a namespace then the Mac specific Qt
classes should be namespaced as well to prevent any duplicated class
names when a non namespaced version of Qt is used in conjunction.
Reviewed-by: Richard
|
| |
| |
| |
| |
| | |
Merge-request: 2358
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change adds a workarond where we call show() on the
popup in QCompleter::setPopup. Unfortunately this causes
unnecessary startup delays and popup flicker in Creator.
The original bug reports (254456 and 254460) are not
reproducible on Cocoa.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits)
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
Added rpp and rsg files to ignore filter.
Moved two profiles to the correct directory.
Fix build break caused by undefined symbol SetDialogPreference
Temporarily disable problematic dll.
Use the same concept for per-lib tweaks as armcc
Consistently use the * in configure
Symbian doesn't have large file support currently, just turn it off
Remove largefile config test
Make sure that we have all compile flags available always
Enabled dependencies for .dso and .lib libraries only.
Switched to using DEF_FILE, which is the official variable.
...
|
| | |
| | |
| | |
| | | |
RevBy: Miikka Heikkinen
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QPrintDialog uses QFileSystemModel with QCompleter. In that case with the
4.7 version of QCompleter it was trying to complete stuff even if the
prefix was empty. I also fixed QPrintDialog, it was using QFSCompleter
which didn't work in QPrintDialog (QFSCompleter is designed for
QFileDialog). Now it uses a regular QCompleter.
Task-number:QTBUG-8556
Reviewed-by:trond
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Part of QtP delta reduction effort.
Task-number: QT-3055
Reviewed-by: Janne Koskinen
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was a Carbon specific problem, it was already working fine in
Cocoa
Task-number: QTBUG-8521
Reviewed-by: richard
|
| |
| |
| |
| | |
Reviewed-by: MortenS
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | | |
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
miutset.h is coming from the app layer that we
are not supposed to use. Since we still need the
constant we're better off working around the
dependency and to forward declare the
one constant we need from the file.
Reviewed-By: Iain
|
| | |
| | |
| | |
| | | |
NSInteger is int/long on 32/64 bit.
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
On Mac, we never emit the activation signal of the tray icon with
other reasons than triggered. The reason; it was never implemented.
This patch connect the dots.
Task-number: QTBUG-5770
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Prasanth
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that popups that were opened
from a system tray icon did not get activated
and clicking outside would not close
the popup as intended. Ensuring that all popups
get activated on show should solve this problem
in the general sense.
Task-number: QTBUG-7386
Reviewed-by: denis
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The reason was that QMacCocoaAutoReleasePool included a
a call to NSApplicationLoad(). This call should only be
made for carbon based application anyway, so we just ifdef
it out (event how clumsy the placing of the call is). The
CPU problem came because after the call, [NSApp isRunning]
would return true, an as such, confuse the event dispatcher
later on.
Reviewed-by: MortenS
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also fix a bug with QCompleter and QFileSystemModel when the popup was
shown even if there was nothing to complete.
Task-number:QTBUG-5376
Reviewed-by:janarve
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QFileSystemModel provides the same features as QDirModel but in a
efficient way so no need to keep QDirModel around.
This commit mark as obsolete QDirModel. Examples has been ported to
use QFileSystemModel instead. QCompleter also gain the support of
QFileSystemModel to complete nicely a line edit.
This commit also add a new signal in QFileSystemModel when the directory
is loaded, i.e. the thread has finished to read the current dir.
Task-number:QTBUG-3884
Reviewed-by:ogoffart
Reviewed-by:gabi
Reviewed-by:mbm
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/fancybrowser/main.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/bookmarkmanager.cpp
|
| |
| |
| |
| | |
Reviewed-by: jbache
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
and higher
This is necessary to allow Windows Explorer send the WM_TASKBARCREATED message to a Qt application
(to recreate its QSystemTrayIcon-s) even when it is running in a higher UIPI privilege level.
Merge-request: 1626
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 1599
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | |/
| | |
| | |
| | | |
Document that that QSystemTrayIcon::showMessage requires Growl.
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
RApaLsSession based implementation did not succeed to start music
player in some S60 devices to playing mode. The only found solution to
this problem was to start using CDocumentHandler based implementation.
CDocumentHandler adds a new S60 dependency, but it is needed to make
QDesktopServices APIs fully fuonctional. However if Qt is comfigured
without S60 we still fallback to RApaLsSession implementation.
With CDocumentHandler the files are also opened as embedded, due to the
fact that swicthing files in stand-alone mode would require SwEvent
capability.
Task-number: QTBUG-4699
Reviewed-by: Miikka Heikkinen
|
|/ |
|