| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Before this change:
target.CONFIG+=no_check_exist implies the file is a file, no way to
make an install rule for a non-existing directory.
Now, its possible to specify the type:
target.CONFIG+=no_check_exist directory
will install a directory.
target.CONFIG+=no_check_exist executable
will install an executable.
target.CONFIG+=no_check_exist data
will install a normal file.
The default case, if no type is given, like in
CONFIG+=no_check_exist
will call QFileInfo::isExecutable() to determine, if its a data file
or executable. This is the old behaviour.
Task-number: QTBUG-10624
Reviewed-by: ossi
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |/
| | |
| | |
| | | |
Reviewed-by: ossi
|
| |/ /
| |
| |
| | |
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | |
| |
| |
| | |
this is relevant only for maintainers, but still.
|
| | | |
|
| | |
| |
| |
| |
| | |
the existing values are fixed-point representations of the msvc
versions, so adhere to it.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix project file generation for MSVC 2010
Fix wrong translation and clip for the raster paint-engine on Mac
Return the correct library name in qt_gl_library_name for GLES*
qmake: remove useless evaluation of variables from VS project generators
Fix QT_NO_LIBRARY
Documentation for the Elastic Nodes example.
qmake: fix duplicate linker options in VS project files
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
qmake: fix duplicate compiler options in VS project files
Documentation for the Drag and Drop Robot example.
Fix crash in styles example when running with opengl graphicssystem
Fixed the sizehint for cols/rows in qtableview
QUrl: parsing of host name with an undercore.
Null pointer check
Revert "Try to use multisampled opengl graphicssystem on all platforms"
A small mistake when comparing the flag.
Add unit tests covering most of QVector's API.
Fix crash when CoreText fails to shape text for us
Fix crash when using opengl graphicssystem on desktop
Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Adding the post-build step to copy the dll into bin
Reviewed-By: Thierry
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The variables QMAKE_LFLAGS_DEBUG, QMAKE_LFLAGS_RELEASE,
QMAKE_CXXFLAGS_DEBUG and QMAKE_CXXFLAGS_RELEASE are handled by .prf
files in mkspecs/features and don't need to be evaluated by generators.
Reviewed-by: ossi
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't have to evaluate QMAKE_FLAGS_CONSOLE or QMAKE_LFLAGS_WINDOWS.
These files do it for us:
mkspecs/features/win32/console.prf
mkspecs/features/win32/windows.prf
Reviewed-by: andy
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't have to evaluate QMAKE_CXX_FLAGS_WARN_ON / ..._OFF
mkspecs/features/warn_on.prf / ..._off.prf do it for us.
Reviewed-by: andy
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
bye bye QMakeProjectEnv
short-cut evaluation inside if() tests
eliminate special splitting of INCLUDEPATH and DEPENDPATH
do not env-expand cache file path
s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
s/INCPATH/INCLUDEPATH/
s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
warn about usage of deprecated variables
warn about using non-lowercased replace $$function()s
add -Wdeprecated option (on by default)
make QMakeProject::isEmpty() consider legacy mappings
document some functions' scope
fix $$size() not using function-scoped variables
doc: Fixed some qdoc errors.
qdoc: Added breadcrumbs for namespaces.
Autotest: check that we receive key events on toplevel widgets
Cocoa: key events stopped working
Update Polish translations
qdoc: Added "All namespaces" to the API Lookup box.
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qmake variables would have been exported to the command run by
$$system() and - optionally - to the command run by system().
however, this was a unix-only feature and made the kernel barf
at the huge environment on older linuxes.
as we don't like platform-specific hacks which are unreliable,
in particular when a workaround exists (the commands execute
shell code after all, so one can inject arbitrary env variables),
just blow it away - it was undocumented, after all.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this is consistent with the top-level scope evaluation.
if() is undocumented and the old behavior would be pretty unexpected for
anyone, so i feel free to break compatibility.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
it wouldn't work as expected anyway, as the splitting rule (using the
semicolon in addition to whitespace) applied only to the string literal
from the pro file, but not any expanded [environment] variables, etc.
(i.e., where it might make any sense). so just drop it, as it would
considerably complicate later optimizations. it wasn't documented
anyway ...
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
it makes totally no sense - if one wanted to expand env variables,
one would let the shell do it.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
planning to kill off that (mis-)feature at some point.
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | |/ /
| | |
| | |
| | |
| | | |
Reviewed-by: Janne Anttila
Reviewed-by: joerg
|
| |/ /
| |
| |
| |
| |
| |
| | |
Qt generic slash separator must be supported also in platforms
that do not have that as platform specific separator.
Reviewed-by: Thomas Zander
|
| | |
| |
| |
| | |
Reviewed-by: Martin Petersson
|
| | |
| |
| |
| | |
Reviewed-by: trustme
|
| | |
| |
| |
| | |
Reviewed-by: Marius SO
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
it is positively backwards to apply any expansions at such a low
level - they have already been applied where necessary.
Reviewed-by: mariusSO
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
it is a completely bizarre feature which is nowhere documented and no
justification for it is provided anywhere.
Reviewed-by: mariusSO
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| | |
QMakeProject::init initializes the whole project, while
QMakeProject::reset initializes the parser for a single file.
"recursive" needs to apply to the whole project.
Task-number: QTBUG-9847
Reviewed-by: Oswald Buddenhagen
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Janne Koskinen
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Provide overview for Symbian capabilities.
Fix QNX screen initialization
tst_qftp: Attempting to reproduce a crash
QNAM HTTP: Do not pipeline with WebLogic servers
Autotest: update path location on the test server
Autotest: update location of fluke.gif on test server
Make qsTr work in global scope
Not possible to show selected text in virtual keyboard
Fix typos, there is no QT_NO_SSL
Export .flm files always if they are different
Make qmake possible to build with mingw using qmake.pro
QS60Style: Single Click UI support for SD 9.2 time-box
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Provide overview for Symbian capabilities.
Fix QNX screen initialization
tst_qftp: Attempting to reproduce a crash
QNAM HTTP: Do not pipeline with WebLogic servers
Autotest: update path location on the test server
Autotest: update location of fluke.gif on test server
Make qsTr work in global scope
Not possible to show selected text in virtual keyboard
Fix typos, there is no QT_NO_SSL
Export .flm files always if they are different
Make qmake possible to build with mingw using qmake.pro
QS60Style: Single Click UI support for SD 9.2 time-box
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/script/api/qscriptengine.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There are valid cases where Qt .flm files found under
/epoc32/tools/makefile_templates/qt/ have newer timestamp than those
in Qt repo one is developing against but still need to be overwritten,
so always export .flm files when the timestamp is different instead of
just when the files to be exported are newer.
Task-number: QT-3253
Reviewed-by: TrustMe
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added missing libraries
Reviewed-by: Marius Storm-Olsen
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Phonon MMF: fixed typo in trace statement
Update to def files for 4.7.0-beta1
Fixed installer_sis target for 4.7
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to pkg file generation refactoring in 4.7, these fixes hadn't
been ported from 4.6 to 4.7 previously.
Task-number: QTBUG-9864
Reviewed-by: Janne Koskinen
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits)
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
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
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for
cetest. Reverting my initial naive attempt to fix this
bd5d323373dbaf9d827126b77895da253128c1e5.
We're introducing a new define for building qmake without generators.
QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of
the Visual Studio Add-in.
Reviewed-by: ossi
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits)
Revert Merge Request 551. This introduces regressions to Qt.
Fixed scroll area size calculation on Mac.
Fix a race where QThread::exit() is "lost" when called after start()
make a partial build of linguist in no-gui config
make the code less of a trap
fix build from top level
Partially revert MR 543 changes to Linguist.
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.
...
|
| | | | | |
|
