| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
These are not dependent on QObject, I don't know how they ended
up inside there.
Reviewed-by: Jedrzej Nowacki
|
|
|
|
|
|
| |
Because that's where they belong.
Reviewed-by: Jedrzej Nowacki
|
|
|
|
| |
NSInteger is int/long on 32/64 bit.
|
| |
|
|
|
|
|
|
|
|
|
|
| |
When a graphicsobject subscribes to a gesture using the
IgnoredGesturesPropagateToParent flag, normal propagation rules do not apply to
the gesture, and instead all gestures of the given type that are started over
the item will propagate to parent items only.
Task-number: QTBUG-7400
Reviewed-by: Andreas
|
|
|
|
|
|
|
| |
This reverts commit 7228fdef61fd126481574e53d6d022d134219cc3.
Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be
be removed so that zlib will come from -lQtCore4. Otherwise, linking
can fail due to there being two different libraries providing zlib.
This affects building shared Qt.
This patch fixes the problem for win32-g++ and also unix. Assumed
that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough.
Not sure why parallel logic is in src/sql/drivers/drivers.pri but
I fixed that too.
Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
|
|
| |
OPENSSL_LIBS can introduce -lz. To respect qt-zlib, this must be
replaced with -lQtCore4. Otherwise, linking can fail due to there
being two different libraries providing zlib.
Merge-request: 405
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
|
|
|
|
| |
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-request: 455
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
| |
Reviewed-by: Zeno Albisser
|
|
|
|
| |
Reviewed-by: Thiago
|
|
|
|
|
|
|
|
| |
Reorder switch.
Directly return instead of having a null QByteArray, using append
and then returning it.
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The change introduces regression in QIntValidator and QInputDialog, which needs
to be addressed before pushing the change again.
Also reverted the following two compile fixes:
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9.
This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e.
This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6.
Reviewed-by: trustme
|
|
|
|
|
|
|
|
| |
Use the coordinates passed in the LPARAM parameter, the pt passed with
the MSG is not always correct.
Task-number: QTBUG-7637
Reviewed-by: Denis
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
Fix copyright year.
Fix broken license headers.
doc: Fixed some qdoc errors.
Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
doc: Fixed some qdoc errors.
QNetworkAccessManager: add method to send custom requests
doc: Fixed some qdoc errors.
Optimization: Avoid calling out to public API function
Mac: submenu shows up at the wrong position
Add operator< and qHash for QSharedPointer and fix operator-.
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
...
|
| |\ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Window modal dialogs are shown as sheets on Mac, reusing them is showing
some painting artificats. So make sure we create a new window everytime
a sheet is shown. This only applies to Carbon, the Cocoa versions dont
have this problem.
Task-number: QTBUG-8198
Reviewed-by: MortenS
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This method was added to support e.g. HTTP OPTIONS (needed by Webkit);
rather than adding one method for each of those exotic verbs, there is
now a generic version for all.
Reviewed-by: Markus Goetz
Reviewed-by: Andreas Kling
Task-number: QTBUG-8206
|
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
All the public QScriptEngine::create() function does is call the
private implementation anyway, so call QScriptEnginePrivate::create()
directly.
Reviewed-by: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If one opens a menu with a submenu, the submenu will be shown at a
wrong position on screen. The reason is that upon show, the top menu
will be centered on screen. But the child menu will be shown first, and
tries to center of the parent that has not yet been shown. So moving the
top menu upon show will fool the subwindow.
This patch will move the center code into the setGeometry_sys function
so that any resize on the window before it has been shown will re-center
the window correctly.
Task-number: QTBUG-2196
Reviewed-by: prasanth
|
| |
| |
| |
| |
| |
| | |
This allows using QSharedPointer in QHash and QMap keys.
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| | |
Reviewed-By: Trust Me
|
| |
| |
| |
| | |
Reviewed-By: Trust Me
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Changed the initialization of the system locale to make construction of the
QLocale object as lightweight as possible. So now the default contructor just
creates a QLocale and QSystemLocale objects, but doesn't try to fill the cache
in the latter with data from the system and postpones it until it is actually
requested (most applications create QLocale objects on the stack and might not
even use the data from the system locale, so we don't need to initialize system
locale right away).
Reviewed-by: Thiago Macieira
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
qdoc3: Completed handling of the new \pagekeywords command.
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
...
|
| | | | |\ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge-request: 2307
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
RevBy: TrustMe
Details: This is the first part of an implementation
that introduces handling of the dbus autoStart flag
into qt. This flag determines in the used dbus implementation,
if the receiver of a method call will be started if
it is not running yet, or if it will not be started.
The part from dbus up to QDBusMessage should be fine,
but i do not know how to set this flag from the higher
layers. Ideally this would be generated from qdbusxml2cpp.
Merge-request: 2307
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath
Wrong cursor shown by the parent window after setOverrideCursor().
Fixed Mac OS X compile time error by using GLint for temp.
qdoc3: Added curly braces in switch statement for braindead compiler.
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
qdoc: Removed debugging code.
Doc: Updated the configuration file for the Simplified Chinese docs.
qdoc: Standardized encoding names and updated the Chinese config files.
Doc: Added Simplified Chinese documents and build rules for them.
qdoc: Added support for different source and output character encodings.
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The changes introduced in 9d713d7e73a88fe8328b55d2ab9af8c215dcb89d made
QDirPrivate rely on the order of sub-expression evaluation. In some
platform/compiler combinations, the instance of QDirPrivate::Data::path
being changed would be the pre-detach one.
With this change, that commit is partially reverted. Also, inlined the
code in initFileEngine since this makes the actions therein explicit.
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When calling QApplication::setOverrideCursor() and then showing a modal
dialog, the parent window of the dialog reverts to the default cursor.
At this point the parent window is in a disabled state, Windows uses the
default cursor for the class. We need to override this behavior by
handling WM_SETCURSOR.
Task-number: QTBUG-6525
Reviewed-by: Denis Dzyubenko
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The GLint is then returned as an int, which is ok.
|
| | | | | | |\
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
qdoc: Removed debugging code.
Doc: Updated the configuration file for the Simplified Chinese docs.
qdoc: Standardized encoding names and updated the Chinese config files.
Doc: Added Simplified Chinese documents and build rules for them.
qdoc: Added support for different source and output character encodings.
Doc: Synchronize configuration files for easier maintenance.
|
| | | | | | | |\
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Added a build rule for the documentation - disabled by default.
Doc: Added the qdoc manual to the repository for future maintenance.
qdoc3: Fixed bug in creation of qt.pageindex.
qdoc3: Added capability to create qt.pageindex.
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
qdoc: Made a temporary fix for comment highlighting.
Doc: Tidied up the class layout and removed an unnecessary image.
Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.
Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.
qdoc: Removed debugging code.
Doc: Updated the configuration file for the Simplified Chinese docs.
qdoc: Standardized encoding names and updated the Chinese config files.
Doc: Added Simplified Chinese documents and build rules for them.
qdoc: Added support for different source and output character encodings.
Doc: Synchronize configuration files for easier maintenance.
|
| | | | | | | | |\ |
|
| | | | | | | | | |\
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Incorrect property setter generated by dumpcpp for Microsoft Word 2007.
Cocoa: Implement our own NSApplication subclass
Cocoa: Menu in menubar stays highlighted
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
This particular propery setter had multiple parameters (or is Array type
property). An incorrect return type was set by the function generator.
This patch clears the type name for such INVOKE_PROPERTYPUT functions,
the return type will be void.
Task-number: QTBUG-7571
Reviewed-by: Volker Hilsheimer
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
We have avoided doing so up till now, since we cannot always
know if we will be able to use it. If some 3rd-party application
creates NSApplication before Qt, our subclass will never be
used (because of the singleton pattern that NSApplication follows).
However, in most cases, Qt will be used in standalone applications,
or the 3rd-party application will not subclass NSApplication. And
in those cases, we can make certain functionallity more robust.
Rev-By:msorvig
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
If you use the menu bar for a window to open up
another window woth no menu bar, the first menu bar
stays highlighted once it is set as current again.
The reason is that we remove the first menu bar before
cocoa gets a chance to update it correctly. This patch
implements a system for us to post a message/call to
cocoa, so we delay removing the toolbar until after
cocoa has finished closing it properly.
NB: Rather than posting the call to a window on screen, it
would have been better and safer to post it no window, and
then receive the event in the event handler of NSApplication.
But for the moment, we have decided not to subclass NSApplication...
Rev-By:prasanth
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Reviewed-by: Trust Me
|