| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
When the variable was not initalized it would randomly show a native
font dialog or a non native one if the DontUseNativeDialogs flag was
set.
Task-number: QTBUG-12042
Reviewed-by: cduclos
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using namefilters in the non-native file dialog is a bit broken by
design, since it don't store the whole selected name filter, but
only the filter with details stripped off (if this is specified). And
it stores this data in gui widgets. And the native file dialog also
suffers from this. At least this patch will pick the first matching
name filter (with details) given a details-stripped version.
Task-number: QTBUG-12870
Reviewed-by: cduclos
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The reason it does this, is because we set up a parent child relationship
on the dialog. And when doing so, Cocoa shows the dialog. So we need
to delay setting up this until after we have set the dialog geometry
Task-number: QTBUG-9198
Reviewed-by: prasanth
|
| | |
| |
| |
| |
| |
| |
| |
| | |
We were making the wrong assumption that the selectedFilter string
will be valid always, when calling functions like getSaveFileName().
Task-number: QTBUG-12461
Reviewed-by: Denis
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch takes care of missing icon on Windows Vista+7.
It also updates the metrics to look more native in both
versions.
Task-number: QTBUG-9873, QTBUG-11974, QTBUG-6120
Reviewed-by: prasanth
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to somewhat special nature of colorDialog, it makes no sense to
make it fullscreen, as it is not totally stretchable in height. Making
it fullscreen only makes it appear higher on the screen and there is
an ugly gap between the dialog and softkeys.
Therefore, as a fix, colorDialog is shown in its "natural" window
state.
Task-number: QTBUG-11668
Reviewed-by: Miikka Heikkinen
|
| | |
| |
| |
| | |
Reviewed-by: Shane Kearns
|
| |\ \ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is due to that in Symbian, dialog border is not definitive.
The actual border might be few pixels inside the dialog area to support
partial transparency of dialog corners. Therefore laying out labels
to near border (to y coordinate 0) makes the label cross the dialog
border area for some themes.
Fixed, by moving the dialog content down
PM_DefaultTopLevelMargin pixels.
Task-number: QT-3511
Reviewed-by: Alessandro Portale
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The screen estate runs out for nHD landscape. Due to this, all
"system" dialogs (file, color, font dialogs and wizards) in Symbian
are now shown in fullscreen mode, instead of being just maximized.
Task-number: QTBUG-11668
Reviewed-by: Miikka Heikkinen
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
For a newly created folder in the current path, we were returning NO for
the "shouldShowFilename" callback. This patch moves the check for
directories to the begining.
Task-number: QTBUG-11532
Reviewed-by: Carlos Duclos
|
| | |
| |
| |
| |
| | |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-10512
Reviewed-by: Kim
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits)
Avoid running animation when loopCount == 0
Set the pictures for the examples of multitouch
Compile fix on Windows.
Remove an unnecessary assert.
Documentation for the Pad Navigator Example.
New Pad Nagivator example implementation.
Skip definition of wintab functions in case of QT_NO_TABLETEVENT.
Made curve tesselation be dynamically adjusted based on transform.
Modified QPainter and QPixmap benchmarks to use raster pixmaps.
Stabilize tst_QWidgetAction::visibilityUpdate
Fix compiler warning in QT_REQUIRE_VERSION
Stabilize tst_QColumnView::parentCurrentIndex
Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fix typos in Elastic Nodes example documentation.
Made paint engine texture drawing work in GL ES 2 and updated docs.
Opt out of visual-config size checks with extension
Fix off-by-one in text layouts and widget size hints on Mac
Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry
Mark QFileDialog::Options as a Q_FLAGS
fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits)
Compile fix on Windows.
Remove an unnecessary assert.
Documentation for the Pad Navigator Example.
New Pad Nagivator example implementation.
Skip definition of wintab functions in case of QT_NO_TABLETEVENT.
Made curve tesselation be dynamically adjusted based on transform.
Modified QPainter and QPixmap benchmarks to use raster pixmaps.
Stabilize tst_QWidgetAction::visibilityUpdate
Fix compiler warning in QT_REQUIRE_VERSION
Stabilize tst_QColumnView::parentCurrentIndex
Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fix typos in Elastic Nodes example documentation.
Made paint engine texture drawing work in GL ES 2 and updated docs.
Opt out of visual-config size checks with extension
Fix off-by-one in text layouts and widget size hints on Mac
Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry
Mark QFileDialog::Options as a Q_FLAGS
fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux
Fixed scrolling bugs in widget graphics effect backend.
Fixed source pixmap bug in widget graphics effect backend.
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
warning: format not a string literal and no format arguments
Task-number: QTBUG-8967
Reviewed-by: Gabriel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
So it can be inspected with designer
Task-number: QTBUG-10323
Reviewed-by: jbache
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits)
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The default QObject constructor was not called, meaning the vista helper
was never registered as a child of the QWizard (and therefore never
deleted when the QWizard was destructed).
Task-number: QTBUG-10203
Reviewed-by: olivier
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/ /
| |
| |
| |
| |
| |
| |
| | |
RVCT builds cannot seem to be able to deal with data symbols at runtime,
so made accessors for fetchedRoot test variable. Also moved it out
of QFileInfoGatherer class as there is no need to have it there.
Reviewed-by: Janne Koskinen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "QDialog: user-moved dialog would not show on the same place after hide"
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 434d2312b63090cfd2ba7e0f3728b5b225bcaeec.
This patch was partially wrong and introduced some unwanted effects on
KDE and Windows. And it's probably not the righ solution.
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem occured if you told the dialog to not show name filter
details, then tried to select a filter specifying those details.
The patch makes sure that we accept a filter as found in the
drop down list if it matches the specified filter with or
without details
Task-number: QTBUG-8439
Reviewed-by: msorvig
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
The Qt::WA_Moved was not being set during the move event as notified
by the window manager. This is a behavior change for 4.7, but we think
it's more user friendly than the previous behavior.
Reviewed-by: mbm
Task-number: QTBUG-9991
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
Autotest: update to the new values for the locale
do not expand variables in read()'s file name
remove ability to use break() a block outside any loop
don't add -unix to the qmake command line
Increase the timeout for the QNAM getter test to 30 seconds
Remove unstable hosts from the list
qdoc: Output TOC for more class ref pages.
Other fixes to the remote network stresstester
Fix SSL connection problem.
Make sure we don't try URLs that aren't HTTP or HTTPS
Fix menu bar visibility.
Add SSL remote host tests
Split the remote and the local tests in two, in preparation for SSL tests
Add tests for remote hosts
Change the way we calculate the average transfer rates.
Finish renaming
Move these tests to tests/manual.
Add a QNetworkAccessManager stresstest
Add a non-blocking native function too
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The PMPrintSession inside the NSPrintInfo can get changed by the
NSPageLayout. Refresh the session pointer saved in the
QMacPrintEnginePrivate after showing the page setup dialog.
Task-number: QTBUG-9880
Reviewed-by: Trond
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If AVKON is using a StaCon component (combined Status and Control
Pane), then dialogs were incorrectly positioned. Native side,
places dialogs shown with StaCon to right border, whereas the
current implementation was placing them to left.
Fixed, by asking from AVKON the rect for StaCon. If it is empty,
then use the existing placement rules, otherwise place to the right
border.
Task-number: QTBUG-9910
Reviewed-by: Janne Anttila
|
| | |
| |
| |
| |
| |
| |
| | |
This reverts commit a165d1cfbb15ced6079a0d752fbdb37a478ff46f.
Was causing an error: (msvc2005)
qthread_win.cpp(369) : error C3861: 'SwitchToThread': identifier not found
|
| | |
| |
| |
| | |
Derived from the comments in merge request #2175
|
| | |
| |
| |
| | |
It would make qconfig crash.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits)
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
Implement heightForWidth support for QTabWidget and QStackedLayout.
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
...
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2356
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 2357
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| |\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
This fixes a problem with accessibility and QFileDialog, in addition the
fix to complexwidgets.cpp will also fix any itemview that uses a root
index.
Reviewed-by: Jan-Arve
|
| | |
| |
| |
| |
| |
| | |
qdialog.cpp:261: warning: enumeral and non-enumeral type in conditional expression
Reviewed-by: Thiago
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicswidget.h
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| | | |
| | |
| | |
| | | |
Reviewed-by:TrustMe
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The completer was trying to populate the combobox for completion even
if the dialog was hidden (the native one is shown).
Task-number:QTBUG-8624
Reviewed-by:richard
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
