summaryrefslogtreecommitdiffstats
path: root/src/gui/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-7/+12
|\
| * Doc: fix typoOlivier Goffart2010-05-171-1/+1
| |
| * QCompleter: fix misuse of QMap that can lead to crashesOlivier Goffart2010-05-171-6/+11
| | | | | | | | | | | | Patch providedin the task. Task-number: QTBUG-8407
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-173-54/+300
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * QSystemTrayIcon: put WinCE specific code into qsystemtrayicon_wince.cppJoerg Bornemann2010-05-073-54/+303
| | | | | | | | | | | | | | | | 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
* | Make QCompleter cope with restricted screen real estate (mobile devices)Dominik Holland2010-05-061-6/+15
| | | | | | | | | | | | | | | | | | 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
* | Ensure that the Mac specific Qt classes are namespacedAndy Shaw2010-05-041-19/+18
| | | | | | | | | | | | | | | | 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
* | Fix QT_NO_FILESYSTEMMODELTasuku Suzuki2010-04-121-0/+2
| | | | | | | | | | Merge-request: 2358 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | Revert change 7bf4512659 on Cocoa.Morten Johan Sørvig2010-03-231-1/+1
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-171-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-161-1/+8
| | | | | | | | | | | | RevBy: Miikka Heikkinen
* | | Fix the QPrintDialog showing a popup with nothing.Alexis Menard2010-03-161-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-3/+3
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-122-3/+3
| | | | | | | | | | | | | | Part of QtP delta reduction effort. Task-number: QT-3055 Reviewed-by: Janne Koskinen
* | 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
generated by cgit v0.12 at 2024-11-23 14:42:06 (GMT)