| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Martin Jones
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
In libpng >= 1.5.0, the png_info struct is no longer exported
Merge-request: 1023
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16176
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| |
| |
| |
| | |
the unix configure already got it right
Task-number: QTBUG-15978
Reviewed-by: Alessandro Portale
Reviewed-by: mariusSO
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15228
Reviewed-by: mariusSO
|
| |
| |
| |
| | |
Task-number: QTBUG-16369
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15931
Reviewed-by: Kevin Wright
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15787
Task-number: QTBUG-15788
|
| | |
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| | |
Basically by adding a clear soft key to the currently empty right soft key in warninng window in qmlviewer.
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| | |
Small developer usability improvement
Task-number:
Reviewed-by: Bea Lam
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| |
| |
| |
| |
| |
| |
| | |
As it causes an obscure deletion crash related to
the formeditor rubberband on Mac.
Reviewed-by: con
|
| |
| |
| |
| |
| | |
Merge-request: 993
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 1009
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tested on OS X Snow Leopard with libusb-0.1.12.
The devices are named /dev/cu.usbmodem<opaque id><interface number>,
where the opaque id doesn't seem to be available via the current
libusb interface, but finding it would require usage of native OS X APIs.
The interface number is available at least, and searching for
cu\.usbmodem.*<interface number> as a regexp finds the right devices as
long as not too many devices are connected.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| |
| |
| | |
In some occasions (encountered on OS X), this can be null for some devices.
Merge-request: 834
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-10800
Reviewed-by: Christopher Ham
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16353
Reviewed-by: Christopher Ham
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Absolute include path breaks QtP releases which copy mkspecs under
epoc32 and do not necessarily have the sources available in the
original absolute path and can't patch the paths either at
installation time.
Task-number: QTBUG-16172
Reviewed-by: Oswald Buddenhagen
|
|/
|
|
|
|
|
| |
Developers that want to debug qml on their device have to now install
qmlviewer.sis.
Reviewed-by: Christiaan Janssen
|
|
|
|
| |
Reviewed-by: Michael Brasser
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlViewer: Remove trailing whitespace
QmlViewer: Remove trailing whitespace
QmlViewer: Fix crash on exit
PathView: removing the currentIndex could make it invalid.
Fix broken database creation caused by previous fix
Improvements to anchoring docs
QDeclarativeProperty doc improvements
Update QtGui bwins def file for QTBUG-15615
highlightFollowsCurrentItem: false was not always honored
ListView: Fix calculation of currentItem position when out of view.
Update QtGui def files
Fix openDatabaseSync() to not create unused directory
Document support for QVariantList and QVariantMap type conversion
Some doc clarification for components and javascript integration
Cursor shouldn't blink while dragging cursor position
Qt.include() docs weren't being picked up by qdoc
Doc: make it clear that "z" affects sibling stacking order.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We can't use atexit() handler to show a warning, since whether the
QApplication object then still exists or not is undefined.
Instead, call the method directly where it makes sense (warnings about
command line arguments etc).
Task-number: QTBUG-15740
Reviewed-by: Thomas Hartmann
|
|/
|
|
|
|
|
|
|
|
| |
they cause a crash. fixing it properly would be in no reasonable
relation to the gain (none whatsoever), so just forbid it.
yes, this breaks the message freeze ... big deal in a translation
application. ;)
Task-number: QTBUG-14574
|
|
|
|
|
| |
Task-number: QTBUG-14736
Reviewed-by: Alessandro Portale
|
|
|
|
|
| |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Merge-request: 2523
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Windows configure tool and Linux configure script use different options for OpenGL modules.
Windows configure tool uses -opengl-es-cm and -opengl-es-2.
Linux configure script uses -opengl <api> where <api> can be as "desktop", "es1", "es2" and are more common.
Windows configure tool is changed to understand Linux OpenGL configure options as well.
The old options are retained for compatibility but not documented any
more.
Reviewed-by: ossi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The imageformat-plugins variable is never referenced by the .pr[io] for
building Qt. Its presence in configure.exe appears to be a vestige of
an earlier state of affairs.
As a reminder, jpeg, mng, tiff and gif can be built into QtGui or built
as plugins. The default is plugin. During configuration, this can be
overridden by adding, for example, "no-jpeg" to disable support
altogether or "jpeg" to build into QtGui.
Merge-request: 961
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
| |
de8c9d69fa7c7cc50e9a238e58f6e9370f158fc4 ensured the window was at
least partly visible on Windows and Linux but it did not work on Mac.
Task-number: QTBUG-15783
Reviewed-by: Alan Alpert
|
|
|
|
|
| |
Task-number: QTBUG-15720
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
| |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits)
Fixed tst_qwidget::winIdChangeEvent
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits)
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
...
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Fixed handling of QInputMethodEvents with nonzero replacementLength.
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-15393
Reviewed-by: axis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Previously it was only possible to use EPOCROOT in qt.conf via env
variable, while qmake & configure could resolve it also via devices.xml.
Changed qt.conf parsing to support $${EPOCROOT} tag and use same
resolving logic as qmake & configure.
Task-number: QTBUG-15393
Reviewed-by: axis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit prepares epocroot.cpp and registry.cpp to be compilable
by lrelease and corelib.
Task-number: QTBUG-15393
Reviewed-by: axis
|