| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Starting from 4.7.0, QVariant is recognized as a standard type by the
meta type system. ActiveQt needs to consider this while converting
COM VARIANT types to a QVariant.
Task-number: QTBUG-13845
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit fc50d7ecaacfbfef1dbefd6ffdc083cb66c5633c)
|
|
|
|
|
|
|
|
|
| |
When the stream is of type CArchiveStream then Stat() is not implemented
and therefore it will not try to read the data. Therefore if this is
not implemented then we try to read the data in chunks instead until
there is no more to read or it fails.
Reviewed-by: Volker Hilsheimer
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.
The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).
We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).
We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.
The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.
However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).
This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)
Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable
Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The scope "win32-g++" comes from the name of the makespec. However, it
is frequently used to check for MinGW. This works fine as long as
win32-g++ is the only makespec for MinGW. Now we need the wildcard
to cover "win32-g++-cross" as well.
Also reordered test of win32 before win32-g++*.
Also took opportunity to use else.
Merge-request: 2407
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
All the windows callback functions need an attribute to force the
alignment of the arg pointer.
Reviewed-by: Benjamin Poulain
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The LockWindowUpdate() was used to reduce the flicker caused when
calling EnableModeless(). After the above commit, no repaints will be
generated by this code path, so we can remove this call.
Task-number: QTBUG-8355
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| | |
Reviewed-by: ogoffart
|
|/
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Task-number: QTBUG-6898
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Do not use LockWindowUpdate() in Win CE
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
Lock the updates during this call from the activex control.
Task-number: 257593
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
| |
MSDN docs suggest that all containers ignore the object name parameter
passed in this function. The tiltebar should always be set by the
container application.
Task-number: 204674
Reviewed-by: Trust Me
|
|
|
|
|
|
|
| |
basically reordering members initialization in constructors or fixing
singed/unsigned checks.
Reviewed-by: Trustme
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
rect is not drawn correctly.
Depending on the type of server, QAxClientSite::TranslateAccelerator()
needs to process the message differently. For ActiveQt based
in-process-servers, only normal Qt event handling is required. For
ActiveQt based out-of-process-servers, the message has to be forwarded
and Qt event handling needs to continue. For all other type of servers,
forward the message and stop Qt event processing.
Styles use the WA_KeyboardFocusChange attribute set on the window to
decide on drawing the focus rect. ActiveQt handles the VK_TAB key in the
QAxServerBase::TranslateAcceleratorW(), the attibute is now set when
focus is changed.
Task-number: 253763
Reviewed-by: Volker Hilsheimer
|
| |
|
|
|
|
|
|
|
|
|
| |
support
Also, buffer sizes passed to Registry APIs were incorrect.
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
|\ |
|
| |
| |
| |
| |
| |
| | |
These two entries were not removed since the server was an OOP server
Reviewed-by: Prasanth
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qaction/tst_qaction.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Updated the project files and headers necessary for enabling this.
Reviewed-by: Thiago Macieira
Reviewed-by: Jens Bache-Wiig
|
| |
|
|
|
|
|
|
|
|
|
| |
This was due to an incorrect type defenition in the typelibrary for a
particular COM object. Enven in such cases we should not generate an
incorrect type.
Task-number: 248612
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@nokia.com>
|
|
|