| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits)
Speed up qsTr() by caching the translation context
Crash while printing from the portedcanvas example on Mac Cocoa.
qdoc: Fixed .qdocconf files for assistant.
Disable debug-only framework builds on Mac.
Compile (with -no-pch)
Add missing QT_NO_BEARERMANAGEMENT ifdefs.
Introduce a qconfig feature for Bearer Management
Fix MOBILITY-404
Remove holes in bearer management data structures.
Don't link bearer plugins against QtGui unnecessarily.
Added missing newline after warning message when using -L with qml
Doc: updating scripts
Fixed a crash on embedded due to uninitialized pointer.
Fix a race where QThread::exit() is "lost" when called after start()
qdoc: Removed all <table> attributes in favor of using css.
Autotest failure: dialogModality test fails on cocoa (macgui)
Force the bic test to compile in 32-bit mode on Mac
Revert "Doc: Updating design files."
Remove statically allocated pixmaps through the post routine
qdoc: Checked for empty title.
...
|
| |
| |
| |
| |
| |
| |
| |
| | |
("Fixes" WebKit build error with ./configure -debug)
This puts the build system in an inconsistent state: We
configure for debug only but still build both debug and
release binaries. Use -no-framework of you want a pure
debug build.
|
| |
| |
| |
| | |
7a5ff9859f5775915ae80c287f51c772599c2379
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This mostly replaces lots of QT_OPENGL_ES defines with QT_NO_EGL
instead. It also switches off EGL auto-detection by default. This is
to make sure we default to using GLX on systems with both EGL and
desktop OpenGL. If -opengl es1|es2 or -openvg is specified, then
EGL auto-detection is switched back on (as a requirement. If
configure auto-detects OpenGL ES it also switches on EGL
auto-detection, but failue then just disables both EGL & OpenGL.
As a side effect, this patch also fixes building Qt when both EGL
and glx are avaliable, as they are in Mesa >= 7.8.0.
Reviewed-by: Trond
Task-number: QTBUG-9691
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits)
Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.
Autotest: add some debugging, just in case there's something wrong
Autotest: fix the fix for the rounding error.
Fix compile error with QT_NO_LIBRARY in QtMultimedia
the _setmode() prototype is different on win ce
qdoc: Changed qdoc to output the new doc format.
Doc: update 'developing on mac'
fcntl.h doesn't seem to exist, either - contrary to an example on msdn
Autotest: fix paths on the test server after update.
Force the repaint during a window resize.
fix compile on wince
remove CONFIG += ordered again
Assistant: Check namespace and virtual folder syntax of help projects.
QtHelp: Fix auto tests.
Fix a crash when unloading libQtCore
Introduce a qconfig feature for QtDBus
Fix build after MR 543 merged.
Compile on 10.4.
revert "Fix the Qt build on Mac OS X/Cocoa 64-bit"
Remove expected failures after JavaScriptCore bug fix
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This adds a -no-gui switch to configure, allowing to build Qt without
QtGui and components depending on QtGui.
This is useful on headless servers, and in using QtCore, QtNetwork,
QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet.
Task-number: QTBUG-4007
Merge-request: 543
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|/
|
|
| |
Reviewed-by: Denis Dzyubenko
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
doc/src/modules.qdoc
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicswidget.h
|
| |
| |
| |
| |
| | |
this is a) more maintainable and b) faster, as it was done in
the makefile generation loop as well.
|
| |
| |
| |
| |
| | |
why first determine how to make no newline just to make a newline
right afterwards?
|
| |
| |
| |
| |
| |
| | |
Originally by Thiago Macieira
Reviewed-by: Justin McPherson
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits)
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
Add missing ,.
get rid of build warning messages
Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.
Add configure test for Maemo Internet Connection Daemon.
fix warning
...
|
| | |
| | |
| | |
| | | |
Task: QTBUG-9156
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
XQMAKESPEC contains the full path, so don't use that, since the full
path could contain "symbian" by accident.
|
|\ \ \ \ |
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Miikka Heikkinen
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Miikka Heikkinen
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Miikka Heikkinen
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Miikka Heikkinen
|
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | | |
Just check the spec instead of the full path to the spec. This avoids
false positives for testing for 'symbian' in the spec name when the
path to the spec contains it instead.
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
...
|
| |\ \ \
| | |/ /
| |/| | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Somewhere in 2005 the code was changed to no longer run the exe but
just to compile it which means that as soon as the simple exe compiled
large file support was set to true. Removing the complexity and just
setting the default to true in the configure script sounds like the
honest thing to do :)
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This also switches the official def file variable in qmake profiles
to DEF_FILE.
Support for freezing def files was also added, but needs more work
and is therefore disabled for now.
Task: QTBUG-7510
Task: QTBUG-8052
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.cpp
qmake/generators/symbian/symmake_sbsv2.cpp
src/plugins/plugins.pro
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
|
| | | | | | | |
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
mkspecs/features/symbian/platform_paths.prf
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This enables fast makefiles as well as intermodule dependencies.
This hasn't been tested with the other Symbian build systems. It's
quite possible that they will break because of this, but we will
handle that at a later time.
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | | |
|
| |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Acked-by: axis
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This was required in order to enable the pieces of code inside
QT_WS_S60.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This was done by enabling the QT_DLL flag when configuring for
Symbian.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This reverts commit 1ca27669332b5e19284297b0bbc57700f59fed33.
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|
| | | | | | | | | | |
|