| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The variable that holds the eval license key is a placeholder that is
patched during package installation. Unfortunately, for a non-final
package build, the placeholder is filled with nulls at compile-time and
a clever compiler will optimize away most of the eval timebomb code due
to a check in the eval code for the first character of the license key
being null.
This commit makes the variable that holds the license key volatile, to
convince compilers that they cannot make assumptions about the contents
of the variable when optimizing.
Task-number: QT-3848
Acked-by: Thiago Macieira
|
|
|
|
|
|
|
|
|
|
| |
By default only drawhelpers and image loaders will now use neon.
If -mfpu=neon has been explicitly enabled in the mkspec,
QT_ALWAYS_HAVE_NEON will be defined, allowing the use of neon
intrinsics elsewhere.
Task-number: QTBUG-15163
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
When you have EPOCROOT environment variable, but compiling for desktop
Linux, the configure script showed a shell syntax error and failed to set
the install prefix, making "install" target to install to the build
directory.
Task-number: QTBUG-15008
Reviewed-by: axis
Reviewed-by: Oswald Buddenhagen
|
|
|
|
|
|
|
|
| |
the jira issue itself has been already fixed, but in a somewhat arcane
way. this one is better maintainable.
Reviewed-by: joerg
Task-number: QTBUG-14955
|
|
|
|
|
|
|
|
|
|
| |
* Remove the auto config tests related to libicd-network-wlan-dev
* Add test for the icd backend
* Add test for connsettings
See also f532d8fcd236be9933e4186a95561e1c264de277.
Reviewed-by: Aaron McCarthy
|
|
|
|
| |
RevBy: Miikka Heikkinen
|
|
|
|
| |
RevBy: Thomas Zander
|
|
|
|
|
|
|
|
| |
Make ICC use "g++-4" as the official buildkey, since it's supposed to
be completely ABI-compatible. Keep the older build key for compatibility
with plugins built with ICC prior to 4.7.
Reviewed-By: Bradley T. Hughes
|
|
|
|
|
|
|
|
| |
With this patch one can configure with -webkit-debug to build Webkit
with debug symbols without having to manually edit WebCore.pro.
Merge-request: 816
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make qml debugging work with command line arguments
Fix example after changes to font.letterSpacing.
Autotest and small fix for QDeclarativeFontLoader.
Improve error messages
Changes to objects returned from get() should emit itemsChanged() so
Make it clear that private ListModel constructor is only for worker
Remove duplicated move() implementations
Doc changes
Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit
PathView didn't accept mouse events, preventing it from working in a Flickable.
Moving items in a PathView caused PathView.onPath to be set to false.
Fix worker agent to emit ListModel itemsChanged() correctly when set()
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The environment variables do not work for Symbian devices, so
without this change, QML debugging cannot be done on them.
In addition, configure now contains an option to disable qml
debugging entirely, due to it being a major security risk.
Reviewed-by: kkoehne
|
|/
|
|
|
|
| |
As there are versions of SunCC > 5.9
Reviewed-by: TrustMe
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Work around a compiler bug on 64-bit.
Fix handling of braces/no-braces in QUrl::host / setHost.
Changes (and minor corrections) to QByteArray documentation.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
uic: Fix compile breakage in case QT_NO_QT3_SUPPORT.
uic: Improve messages.
Tools (uic/rcc): Improve warning messages.
QDir: Removed checks for existance of fileEngine
QDir and QFileInfo shouldn't lose properties when detaching
Another bug-o introduced in fixing QDirPrivate refactoring
Reverting QDir::detach introduced earlier
QFileInfo: Prepare for engine-less implementation
Removed QFileInfoPrivate::initFileEngine
Simplify QDir::cd
QDir::makeAbsolute could self-destruct on failure
QDir::operator= simplification
QDirPrivate refactoring
QDirPrivate refactoring
...
|
| |
| |
| |
| |
| |
| |
| | |
otherwise it would stay around from a possible previous build with
webkit and confuse the heck out of the build system.
Task-number: QTBUG-13459
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
Sets the arch properly for solaris-cc-64-stlport on x86_64.
This patch also removes three redundant lines in configure and disables
qtconcurrent examples when it's not available.
Reviewed-by: Thiago
|
| |
| |
| |
| | |
like mkspecs/features, mkspecs/modules needs special treatment.
|
| |
| |
| |
| |
| |
| | |
OpenC does not fully support IPv6, therefore we cannot either.
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed two issues in the configure script that prevented
-debug-and-release from working correctly:
We now allow dual debug and release mode for MinGW.
We follow configure.exe in *not* settting PRECOMPILED_DIR. This gives
qmake the freedom to put the debug and release precompiled headers in
separate directories.
Merge-request: 794
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some compilers are compatible with one another. In particular, the
Intel CC on Unix systems is compatible with g++ on the same system.
We should be saving the ABI "name" in the build key, not the compiler
name, but it's too late for that. Choose "g++-{VERSION}" as the
standard ABI name and make ICC support that.
Reviewed-by: Bradley T. Hughes
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
it didn't work for several reasons:
- if the configures don't add webkit to QT_CONFIG, src.pro doesn't even
know that it needs to build WebKit at all, so WebKit would never
inject itself into the build. hen-and-egg problem.
- the in-Qt build doesn't use WebKit.pro in the first place, so a proper
recursive qmake would never create qt_webkit_version.pri. it worked
under unix because configure collects all project files irrespective
of the actual SUBDIRS structure.
- a proper recursive qmake will cache the qt config, so the injection
wouldn't be effective during the first qmake run
so instead let the configures copy the pri file.
|
| |
| |
| |
| |
| |
| |
| |
| | |
i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.
Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| | |
seems it doesn't grok xargs -I. as some other unixes don't grok cp -s,
we have two paths now ...
Reviewed-by: joerg
|
| |
| |
| |
| | |
Task-number: QTBUG-12840
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.
Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698
|
| |
| |
| |
| |
| |
| |
| |
| | |
Calling configure in a shadow build directory led to error messages
when trying to delete the content of $$QT_BUILD_TREE/mkspecs.
Task-number: QTBUG-12764
Reviewed-by: ossi
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the remote command delimiter, this has cahnged at some point.
Assistant: Revert previous commit, issue was already fixed.
fix line endings
fix compilation with -plugin-kbd-*
Fix typo in docs
Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS
Fix compilation with QT_NO_DBUS
fix inaccurate comment
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it certainly is not such a good idea to write mouse when one means kbd
...
Task-number: QTBUG-12483
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Consistent with QT_LFLAGS_* for other database drivers.
Support added to configure shell script and configure.exe.
Respect SYBASE and SYBASE_LIBS.
Use QT_LFLAGS_TDS in project files.
Merge-request: 2416
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | | |
qtmultimedia doesn't need gstreamer. inspired by MR 762.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It has been requested that we provide a configuration option to specify
the default "inner" graphics system that should be used when the
runtime graphics system is in use. The argument specified to the option
is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is
used to instantiate the default graphics system that will be used by
the runtime graphics system.
Reviewed-by: Gunnar Sletta
|
|/ /
| |
| |
| |
| |
| |
| | |
This is necessary in the case where Qt is built as part of the
platform, where configure will run before all the tools are built.
RevBy: Thomas Zander
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In shadow builds, the directory QT_BUILD_TREE/mkspecs/features
isn't a mere symlink anymore. The directories below mkspecs/features
are copied and every single file is symlinked.
This makes it possible to place .prf files into a shadow build's
mkspecs/features directory, like Qt Mobility does with its mobility.prf,
without polluting the source directory.
Task-number: QTBUG-12545
Reviewed-by: ossi
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Fixes: "test: argument expected"
Need whitespace before closing ] .
Reviewed-by: Toby Tomkins
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some of the library dependencies of the ICD Bearer Management plugin use
Qt. We include them in src/3rdparty and link against them statically to
avoid the circular build dependency. Libraries that do not use Qt are
still linked dynamically. The libraries which are statically linked are
libconninet and libgq-gconf.
Task-number: QTBUG-12354
|
| |
| |
| |
| |
| | |
Task: QTBUG-8962
RevBy: Jason Barron
|
| |
| |
| |
| |
| |
| | |
Patch by Fathi Boudra <fathi.boudra@nokia.com>
Task-number: QTBUG-12379
|
| |
| |
| |
| |
| |
| |
| |
| | |
This is done by reading the module files from within qconfig.pri.
Task-number: QTBUG-12379
Rubber-stamped-by: Joerg Bornemann
Rubber-stamped-by: Marius Storm-Olsen
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added silent behavior to the most important Symbian build steps.
Fixed compiling with symbian/linux-armcc and configure -silent option
Removed some warnings from armcc that are unneeded.
Made the makefile build system use QMAKE_CFLAGS.xxx properly.
Automatically disabled unsupported modules for certain compilers.
Fixed an incorrect profile inclusion.
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The "yes" case slows us down on several occasions: (a) the CRC version used
slows down loading debug info when debugging a Qt application significantly,
(b) it does not work wit gdb 7.2's dwarf indexing (again, much slower
startup), and (c) (less important) the stripping takes extra time for each of
us when building Qt.
The flag is still supported for distributions or individuals that want to use it.
Reviewed-by: brad
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use aligned load for the blending of RGB32 over RGB32
tst_moc: workaround gcc bug.
Some more change to the changelog
Fix compilation with QT_NO_GRAPHICSVIEW
Updates changes-4.7.0
Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET.
Add a missing file in the config.test for SSE 4.2
Remove the masking when computing qAlpha()
Add support for more vector instructions on x86
Workaround gcc bug, disable test with old version of gcc
Do not crash due to a infinite recursion when using voiceover on MacOS
doc: Fix qdoc errors for text related files
QGraphicsItem: Animation leaves drawing artifacts when clipping is used.
moc: Slot with complex template default value does not compile
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add the configuration, autodetection, and the #define for vector
instructions on x86. The configuration has been extended with SSE3,
SSSE3, SSE4.1, SSE4.2 and AVX.
Reviewed-by: Andreas Kling
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
src/sql/drivers/drivers.pri
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trust me
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-11385
RevBy: Jason Barron
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This define is also used by the OpenVG module, and therefore needs
to be defined everywhere.
RevBy: Jason Barron
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Based on a patch by Oleh Vasyura <ext-oleh.2.vasyura@nokia.com>.
RevBy: Jason Barron
|
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Otherwise it is not possible to build projects outside of the Qt tree
without installing Qt to the SDK first.
Task: QTBUG-11727
RevBy: Trust me
|