summaryrefslogtreecommitdiffstats
path: root/src/gui/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Make the icon visible when set on an action in a QSystemTrayIcon on MacAndy Shaw2010-03-021-0/+4
| | | | | | | | | | | | | | | | This was a Carbon specific problem, it was already working fine in Cocoa Task-number: QTBUG-8521 Reviewed-by: richard
* | Cocoa: Fix build with namespaceRichard Moe Gustavsen2010-02-221-1/+1
| | | | | | | | Reviewed-by: MortenS
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-58/+57
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-201-1/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | | | Conflicts: qmake/Makefile.unix qmake/generators/symbian/symmake.cpp
| * | Get rid of the dependency on the Symbian app layerLars Knoll2010-02-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Compile.Morten Johan Sørvig2010-02-181-0/+1
| | | | | | | | | | | | NSInteger is int/long on 32/64 bit.
* | | Mac: QSystemTrayIcon::DoubleClick and midmouse not workingRichard Moe Gustavsen2010-02-171-58/+56
| |/ |/| | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-122-0/+4
|\ \ | |/
| * Fixed compilation with QT_NO_WHEELEVENTDenis Dzyubenko2010-02-102-0/+4
| | | | | | | | Reviewed-by: Prasanth
* | Always activate popup windows on showJens Bache-Wiig2010-02-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-13/+0
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peakRichard Moe Gustavsen2010-01-251-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Build fix for MSVC2005 and older SDKThierry Bastian2010-01-221-1/+0
| |
* | Implement showing the volume name for drives on Windows.Alexis Menard2010-01-141-4/+9
| | | | | | | | | | | | | | | | 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
* | Merge branch '4.6'Thiago Macieira2010-01-1324-24/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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
| * Update copyright year to 2010Jason McDonald2010-01-0624-24/+24
| | | | | | | | Reviewed-by: Trust Me
* | Obsolete QDirModel and remove it from the doc.Alexis Menard2010-01-083-13/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.6'Thiago Macieira2009-12-262-0/+22
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.Olivier Goffart2009-12-181-0/+1
| | | | | | | | Reviewed-by: jbache
| * Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista ↵miniak2009-12-151-0/+21
| | | | | | | | | | | | | | | | | | | | | | 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>
* | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-7/+7
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'origin/4.6'Olivier Goffart2009-12-153-23/+80
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * Merge commit 'origin/4.6' into 4.6-upstreamBradley T. Hughes2009-12-092-0/+31
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Morten Johan Sørvig2009-12-081-0/+28
| | |\
| | | * Add support for the Selected QIcon::Mode when rendering the systray icon (Mac)Jono Cole2009-12-071-0/+28
| | | | | | | | | | | | | | | | | | | | Merge-request: 1599 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | * | Doc: Document QSystemTrayIcon::showMessage() Mac behavior.Morten Johan Sørvig2009-11-201-0/+3
| | |/ | | | | | | | | | Document that that QSystemTrayIcon::showMessage requires Growl.
| * | Switched S60 QDesktopServices implementation to CDocumentHandler based.Janne Anttila2009-12-041-23/+49
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Remove mingw specific ifdefs after upgrade to mingw-gcc 4.4Thierry Bastian2009-11-171-1/+1
|/
* Fix typo in license headerAlessandro Portale2009-11-121-1/+1
| | | | | | The word 'module' was missing. Reviewed-By: TrustMe
* Doc: Fixed qdoc warnings.David Boddie2009-11-051-2/+0
| | | | Reviewed-by: Trust Me
* Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-302-12/+6
| | | | | | DataLocation now behaves as on the other platforms, QCoreApplication::organizationName() and applicationName() is included in the returned path.
* Fix compile errors on mingw (The version supplied with Qt 4.5)Prasanth Ullattil2009-10-081-0/+5
| | | | | | Added the missing defines Reviewed-by: Denis
* QDesktopServices compile fix for Windows CEJoerg Bornemann2009-10-071-0/+4
| | | | | | There's no CSIDL_LOCAL_APPDATA on Windows CE. Use CSIDL_APPDATA instead. Reviewed-by: TrustMe
* Fix QDesktopServices::storageLocation() when registry keys are missingJens Bache-Wiig2009-09-161-22/+44
| | | | | | | | | | | | We should not use the registry key when looking up the storage location as this is not really supported by Microsoft and not allways accessible. Instead we now use SHGetSpecialFolderPath. Note that we avoid SHGetKnownFolderPath as it is not available on all CE platforms though it is the reccommended function by Microsoft. Task-number: QTBUG-3241 Reviewed-by: prasanth
* Made QDir::tempPath and QDesktopServices::TempLocation consistent in S60Janne Anttila2009-09-251-4/+1
| | | | | Reviewed-by: TrustMe Autotest: Fixes qdesktopservices::storageLocation test
* * QPixmap: Add toWinHICON() & fromWinHICON() methodminiak2009-09-221-33/+1
| | | | | | | | | | Duplicate QPixmap <-> HICON conversion code removed from qwidget_win.cpp & qsystemtrayicon_win.cpp. Task-number: 218533 Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix focus policy propagation in QCompleter on QWSPaul Olav Tvete2009-09-101-1/+1
| | | | | | | setParent(0) can change the focus policy, so let's retrieve the original value a bit earlier. Reviewed-by: jasplin
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0924-96/+96
|\
| * Update license headers again.Jason McDonald2009-09-0924-96/+96
| | | | | | | | Reviewed-by: Trust Me
* | Fixed 'use of function is deprecated' warnings reported by RVCTJanne Anttila2009-09-091-10/+10
|/ | | | | Task-number: 241223 Reviewed-by: Janne Koskinen
* QCompleter could crash when setting the completion prefixThierry Bastian2009-09-021-3/+2
| | | | | | | This fixes the autotest that was crashing Task-number: 246056 Reviewed-by: ogoffart
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3123-299/+299
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3123-299/+299
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1123-23/+23
| | | | | | | | Reviewed-by: Trust Me
* | reverting the definition of WINVER and _WIN32_WINNT in qglobal.hJoerg Bornemann2009-08-261-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | This just caused too much problems and must be solved another way. In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all of the other stuff that's needed for NTFS symlink support, if its not defined. This is the case if _WIN32_WINNT is less than 0x0500. All other changes in this commit are just reversions of commits that were done for the infamous qglobal.h change. Discussed with prasanth, tested by pulse.
* | qsystemtrayicon_win.cpp fix determination of NOTIFYICONDATA struct sizeJoerg Bornemann2009-08-251-5/+1
| | | | | | | | | | | | | | | | | | | | Now, that we define _WIN32_WINNT as 0x0500, we have no access to guidItem in NOTIFYICONDATA. Thus, we cannot determine NOTIFYICONDATAW_V2_SIZE. But in this case, NOTIFYICONDATAW_V2_SIZE is the same as sizeof(NOTIFYICONDATA). On Windows CE exists only one version of this struct anyway. Reviewed-By: mauricek
generated by cgit v0.12 at 2025-02-08 19:38:03 (GMT)