profile/ivi/qtbase.git
13 years agoMake sure QFont's resolve mask is copied on compilers with C++0x support
Eskil Abrahamsen Blomfeldt [Fri, 29 Apr 2011 08:07:12 +0000 (10:07 +0200)]
Make sure QFont's resolve mask is copied on compilers with C++0x support

The QFont consists of a d pointer and a resolve mask, and they should
both be copied in the assignment operator.

Task-number: QTBUG-18921
Done-by: Friedemann Kleint
(cherry picked from commit cb5e526c6023237c36aac3446a0a18288f39f3a9)

13 years agoFix glyph position issue with fallback fonts
Jiang Jiang [Fri, 29 Apr 2011 07:58:30 +0000 (09:58 +0200)]
Fix glyph position issue with fallback fonts

Task-number: QTBUG-18933
Reviewed-by: Eskil
(cherry picked from commit 18fcbf7ae41504324cd453ba9b9655f3e94f6495)

13 years agoFix crash in raster on X11 when text contains unsupported characters
Eskil Abrahamsen Blomfeldt [Thu, 28 Apr 2011 13:05:08 +0000 (15:05 +0200)]
Fix crash in raster on X11 when text contains unsupported characters

We would assume the font engine was a FT engine and do a static cast
here, which would cause a crash if the box engine was in use instead.

Task-number: QTBUG-17443
Reviewed-by: Samuel
(cherry picked from commit c9c54682bcd23598ac7a8db3b10e9f18c978e268)

13 years agodoc: Minor cleanup in QGlyphs docs
Eskil Abrahamsen Blomfeldt [Thu, 21 Apr 2011 09:50:11 +0000 (11:50 +0200)]
doc: Minor cleanup in QGlyphs docs

Just a minor clean-up in the QGlyphs docs. Mainly to try to trigger
CI.

Reviewed-by: TrustMe
(cherry picked from commit 774b5b8c6a627fc90fb7382bc907db5d2e8193bf)

13 years agodoc: Simplify language in QGlyphs docs
Eskil Abrahamsen Blomfeldt [Fri, 22 Apr 2011 09:20:37 +0000 (11:20 +0200)]
doc: Simplify language in QGlyphs docs

Mainly to trigger CI.

Reviewed-by: TrustMe
(cherry picked from commit 1a1683c2d57debbb3e7f3ae6001eb2c8685dca02)

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2
Gunnar Sletta [Thu, 28 Apr 2011 13:08:33 +0000 (15:08 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2

13 years agoQT += declarative implies += opengl too, so hardcode it to make stuff work
Gunnar Sletta [Thu, 28 Apr 2011 13:07:51 +0000 (15:07 +0200)]
QT += declarative implies += opengl too, so hardcode it to make stuff work

13 years agoMake QtQuick2 compile on QPA
Eskil Abrahamsen Blomfeldt [Wed, 27 Apr 2011 12:21:54 +0000 (14:21 +0200)]
Make QtQuick2 compile on QPA

Moved the logic to set pixel size into the font engines to avoid
making the platform plugin interface too complex, and added a function
in QPA to make an isolated font engine based on font data. Currently
none of the QPA back-ends supports it, but it compiles and spits out
a warning if you try to create a QRawFont from data there. This isn't
used in QtQuick2 anyway.

Reviewed-by: Jiang Jiang
13 years agoMerged master into qtquick2.
axis [Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)]
Merged master into qtquick2.

13 years agoInitial import from qtquick2.
Qt by Nokia [Wed, 27 Apr 2011 12:13:26 +0000 (14:13 +0200)]
Initial import from qtquick2.

Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469

13 years agoAdd .gitignore to each module
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module

13 years agoFix the target for QtUiTools debug on Mac
Prasanth Ullattil [Tue, 29 Mar 2011 13:44:10 +0000 (15:44 +0200)]
Fix the target for QtUiTools debug on Mac

13 years agoOnly run JSC benchmarks if access to the source code
Marius Storm-Olsen [Fri, 25 Mar 2011 18:32:54 +0000 (13:32 -0500)]
Only run JSC benchmarks if access to the source code

When modularized, the benchmark test case might not have access
to the JavaScriptCore source code. So, make sure the test case
still compiles in this case.

13 years agoRemove not needed .pri include
Marius Storm-Olsen [Fri, 25 Mar 2011 18:31:44 +0000 (13:31 -0500)]
Remove not needed .pri include

13 years agoAdd tst_headersclean for each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module

13 years agoModularized tst_compilerwarnings
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings

13 years agoModularized tst_bic and add some helper functions for global test
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test

13 years agoIntroduced the QT.<module>.plugins variable to module profiles.
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.

13 years agoFixed maketestselftest after guiapplauncher was made a global test.
axis [Tue, 22 Mar 2011 08:19:46 +0000 (09:19 +0100)]
Fixed maketestselftest after guiapplauncher was made a global test.

13 years agoRemoved examples and demos that are no longer in qtbase.
axis [Mon, 21 Mar 2011 15:38:55 +0000 (16:38 +0100)]
Removed examples and demos that are no longer in qtbase.

13 years agoRemoved reference to linguist test, which is now in qttools.
axis [Fri, 18 Mar 2011 15:11:18 +0000 (16:11 +0100)]
Removed reference to linguist test, which is now in qttools.

13 years agoAdapted guiapplauncher test to modularized Qt.
axis [Fri, 18 Mar 2011 11:07:45 +0000 (12:07 +0100)]
Adapted guiapplauncher test to modularized Qt.

Now it reads the test cases from text files in each repository
instead.

13 years agoFixed syncqt generation of bin path.
axis [Fri, 18 Mar 2011 11:14:01 +0000 (12:14 +0100)]
Fixed syncqt generation of bin path.

Now it points to QtBase's bin directory, in the case of developer
builds. This makes it easier to develop modules together without
having to install them first.

13 years agoq3tl.h is copied to qalgorithms autotest directory
Prasanth Ullattil [Fri, 18 Mar 2011 11:27:44 +0000 (12:27 +0100)]
q3tl.h is copied to qalgorithms autotest directory

13 years agoFixed "make check" target for qtbase.
axis [Thu, 17 Mar 2011 10:50:26 +0000 (11:50 +0100)]
Fixed "make check" target for qtbase.

It was caused by a missing "tests" target.

13 years agoAdded QT.<module>.imports support to module profiles.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.

13 years agoRemoved uic3 autotest from qtbase
Prasanth Ullattil [Thu, 17 Mar 2011 09:08:57 +0000 (10:08 +0100)]
Removed uic3 autotest from qtbase

13 years agoLoad the sync.profile after setting the variables.
Prasanth Ullattil [Thu, 10 Mar 2011 15:23:01 +0000 (16:23 +0100)]
Load the sync.profile after setting the variables.

13 years agoRemove moved examples/demos
Marius Storm-Olsen [Wed, 2 Mar 2011 19:44:28 +0000 (13:44 -0600)]
Remove moved examples/demos

13 years agoBuild examples and demos in qtbase
Marius Storm-Olsen [Fri, 25 Feb 2011 19:14:08 +0000 (19:14 +0000)]
Build examples and demos in qtbase

13 years agoMake qmake respect <subdir>.CONFIG = no_default_install
Marius Storm-Olsen [Thu, 24 Feb 2011 19:01:18 +0000 (13:01 -0600)]
Make qmake respect <subdir>.CONFIG = no_default_install

It already respects no_default_target

13 years agoTemporarily pointing QT_MODULE_LIB_BASE to qtbase/lib
Prasanth Ullattil [Mon, 28 Feb 2011 15:19:40 +0000 (16:19 +0100)]
Temporarily pointing QT_MODULE_LIB_BASE to qtbase/lib

This has to changed when we start to generate the module binaries
in their respective  lib/bin folders.

13 years agoProperly detect qmodule.pri
Marius Storm-Olsen [Tue, 1 Feb 2011 20:38:28 +0000 (14:38 -0600)]
Properly detect qmodule.pri

13 years agoAvoid recursively including the same arch.pri file
Prasanth Ullattil [Tue, 8 Feb 2011 10:36:13 +0000 (11:36 +0100)]
Avoid recursively including the same arch.pri file

13 years agoMade sure syncqt gets called correctly even if it is not in the PATH.
axis [Fri, 28 Jan 2011 14:17:00 +0000 (15:17 +0100)]
Made sure syncqt gets called correctly even if it is not in the PATH.

13 years agoChanged path references to ActiveQt.
axis [Thu, 27 Jan 2011 08:47:08 +0000 (09:47 +0100)]
Changed path references to ActiveQt.

13 years agoInclude headers.pri from the last path in MODULE_INCLUDES
Prasanth Ullattil [Wed, 26 Jan 2011 08:44:09 +0000 (09:44 +0100)]
Include headers.pri from the last path in MODULE_INCLUDES

13 years agoUse the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
Prasanth Ullattil [Tue, 25 Jan 2011 13:48:39 +0000 (14:48 +0100)]
Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.

13 years agoUse the 'install_name' linker flag on Mac for the frameworks.
Prasanth Ullattil [Tue, 25 Jan 2011 09:08:15 +0000 (10:08 +0100)]
Use the 'install_name' linker flag on Mac for the frameworks.

This is required for the frameworks outside the qtbase module.

13 years agoFixed wrong inclusion of QtHelp module.
axis [Mon, 24 Jan 2011 14:52:04 +0000 (15:52 +0100)]
Fixed wrong inclusion of QtHelp module.

13 years agoFixed a bug in libdir handling.
axis [Mon, 24 Jan 2011 09:14:42 +0000 (10:14 +0100)]
Fixed a bug in libdir handling.

We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.

13 years agoNew configure.exe binary
Marius Storm-Olsen [Sat, 15 Jan 2011 04:25:12 +0000 (22:25 -0600)]
New configure.exe binary

13 years agoRemove hardcoded modules in configure and QT_CONFIG
Marius Storm-Olsen [Mon, 21 Mar 2011 15:02:39 +0000 (10:02 -0500)]
Remove hardcoded modules in configure and QT_CONFIG

Also,
 - Turn qt3support into gui-qt3support, to support
   turning on/off qt3support-functions in core.
 - Fix QT_BUILD_PARTS for configure.exe

13 years agoAdd QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
Marius Storm-Olsen [Sat, 15 Jan 2011 03:35:58 +0000 (21:35 -0600)]
Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed

13 years agoUse correct DESTDIR for UiTools.
axis [Fri, 14 Jan 2011 13:42:12 +0000 (14:42 +0100)]
Use correct DESTDIR for UiTools.

13 years agoMove uitools from QtTools to QtBase
Liang Qi [Wed, 12 Jan 2011 20:06:11 +0000 (21:06 +0100)]
Move uitools from QtTools to QtBase

13 years agoDemos: activate in profiles
Olivier Goffart [Fri, 7 Jan 2011 15:49:50 +0000 (16:49 +0100)]
Demos: activate in profiles

13 years agoMake auto test build
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build

13 years agoexamples.pro removed moved subdirectories
Olivier Goffart [Fri, 7 Jan 2011 12:46:25 +0000 (13:46 +0100)]
examples.pro removed moved subdirectories

13 years agoMake each module refer to its own bin/
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/

Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications

13 years agoMade modules that depend on other modules add their include paths.
Marius Storm-Olsen [Tue, 4 Jan 2011 15:37:10 +0000 (16:37 +0100)]
Made modules that depend on other modules add their include paths.

This is needed so that header files which contain references to those
modules (for example in templates) will have their include paths as
well.

RevBy:    axis

13 years agoMade the internal support for Qt3Support in QtGui compile.
axis [Mon, 3 Jan 2011 21:54:07 +0000 (22:54 +0100)]
Made the internal support for Qt3Support in QtGui compile.

13 years agoMade syncqt collapse redundant ".." sections in paths.
axis [Mon, 3 Jan 2011 18:19:39 +0000 (19:19 +0100)]
Made syncqt collapse redundant ".." sections in paths.

13 years agoFixed useless substitution in syncqt.
axis [Mon, 3 Jan 2011 18:18:14 +0000 (19:18 +0100)]
Fixed useless substitution in syncqt.

The substitution is not necessary and messes up the argument that is
passed in.

13 years agoCorrected include path for UiTools.
axis [Mon, 3 Jan 2011 18:12:55 +0000 (19:12 +0100)]
Corrected include path for UiTools.

13 years agoExtended module profiles.
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.

Each module now sets the QT_CONFIG variable itself.

13 years agoAdd hardcoded qclass_lib_map.h based on 4.8
Marius Storm-Olsen [Mon, 3 Jan 2011 19:09:28 +0000 (13:09 -0600)]
Add hardcoded qclass_lib_map.h based on 4.8

This is only until UIC/Designer handles this properly

13 years agoMove QtSvg into a separate repository
Liang Qi [Mon, 27 Dec 2010 13:49:29 +0000 (14:49 +0100)]
Move QtSvg into a separate repository

13 years agoAdd the private_includes path to the modules .pri file
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file

13 years agoAdd the source path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file

13 years agoRemove the hardcode QT_CONFIG in those pri files.
Liang Qi [Thu, 25 Nov 2010 12:39:10 +0000 (13:39 +0100)]
Remove the hardcode QT_CONFIG in those pri files.

13 years agoMake modules compile without hardcoded paths
Marius Storm-Olsen [Wed, 24 Nov 2010 19:21:56 +0000 (13:21 -0600)]
Make modules compile without hardcoded paths

13 years agoMake qt.prf use new qt_module.pri structure for QT variable
Marius Storm-Olsen [Thu, 25 Nov 2010 04:20:01 +0000 (22:20 -0600)]
Make qt.prf use new qt_module.pri structure for QT variable

This change requires the new resolve_depends(var, prefix) function in qmake.

13 years agoAdd resolve_depends(var, prefix) function to qmake
Marius Storm-Olsen [Wed, 24 Nov 2010 17:51:57 +0000 (11:51 -0600)]
Add resolve_depends(var, prefix) function to qmake

This function calculates the topological order of variables.
We will use it to determine which and in what order to link
module libraries.

The function is not tied to libraries/modules only, but requires
the variables to be ordered to have their dependencies in the
[prefix]<var>.depends subvariable.

Due to the recursive nature of the algorithm it was just much easier
to implement it directly in C++ rather than in a qmake-language
function.

13 years agoAdd module specific pris, and make syncqt create fwd includes
Marius Storm-Olsen [Thu, 25 Nov 2010 02:21:06 +0000 (20:21 -0600)]
Add module specific pris, and make syncqt create fwd includes

The module specific pris define the modules
    name
    version
    dependencies
    include paths
    lib paths
    additional CONFIGs and DEFINES
They are located in the modules source directory, with fwd
includes created in QtBase/mkspecs/modules build directory.
The pris use
    QT_MODULE_INCLUDE_BASE
    QT_MODULE_LIB_BASE
to specify the locations for includes and libs. These paths
are normally based on
    QT_INSTALL_HEADERS
    QT_INSTALL_LIBS
for installed modules, but overridden to the module's build
directory by syncqt for the fwd included pris.
The path of the pris must be specified in the sync.profile
for syncqt to create the fwding pris in QtBase.

13 years agoHave qmake run syncqt automatically, if sync.profile is detected
Marius Storm-Olsen [Thu, 25 Nov 2010 01:56:41 +0000 (19:56 -0600)]
Have qmake run syncqt automatically, if sync.profile is detected

This will normally only happen for top-level pro files,
and syncqt is smart enough to not touch already existing
files. And in edition, syncqt uses the original file's
timestamp on the fwding files.

13 years agoFixup: not paths for other modules
Marius Storm-Olsen [Thu, 25 Nov 2010 01:51:35 +0000 (19:51 -0600)]
Fixup: not paths for other modules

13 years agoMoved symbianpkgrules profiles to be feature profiles.
axis [Tue, 16 Nov 2010 13:31:27 +0000 (14:31 +0100)]
Moved symbianpkgrules profiles to be feature profiles.

13 years agoMake syncqt use sync.profile files from each module
Marius Storm-Olsen [Mon, 15 Nov 2010 19:55:17 +0000 (13:55 -0600)]
Make syncqt use sync.profile files from each module

The sync.profile replaces the hardcoded paths inside syncqt, and
enables it to work for other modules than just qtbase.

13 years agoExpose private support for separate module in syncqt.
Liang Qi [Mon, 15 Nov 2010 15:43:22 +0000 (16:43 +0100)]
Expose private support for separate module in syncqt.

13 years agoExpose source and build directories for QtBase
Marius Storm-Olsen [Thu, 11 Nov 2010 15:35:09 +0000 (09:35 -0600)]
Expose source and build directories for QtBase

Also expose moc, uic, rcc, qdbusxml2cpp, include and lib

13 years agoSome changes for qtbase
Marius Storm-Olsen [Tue, 9 Nov 2010 02:09:10 +0000 (20:09 -0600)]
Some changes for qtbase

13 years agoInitial import from the monolithic Qt.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

13 years agoMoved to using a feature profile instead of direct inclusion.
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.