summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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
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
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
axis [Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)]
Merged master into 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
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module
Prasanth Ullattil [Tue, 29 Mar 2011 13:44:10 +0000 (15:44 +0200)]
Fix the target for QtUiTools debug on Mac
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.
Marius Storm-Olsen [Fri, 25 Mar 2011 18:31:44 +0000 (13:31 -0500)]
Remove not needed .pri include
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.
axis [Tue, 22 Mar 2011 08:19:46 +0000 (09:19 +0100)]
Fixed maketestselftest after guiapplauncher was made a global test.
axis [Mon, 21 Mar 2011 15:38:55 +0000 (16:38 +0100)]
Removed examples and demos that are no longer in qtbase.
axis [Fri, 18 Mar 2011 15:11:18 +0000 (16:11 +0100)]
Removed reference to linguist test, which is now in qttools.
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.
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.
Prasanth Ullattil [Fri, 18 Mar 2011 11:27:44 +0000 (12:27 +0100)]
q3tl.h is copied to qalgorithms autotest directory
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.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.
Prasanth Ullattil [Thu, 17 Mar 2011 09:08:57 +0000 (10:08 +0100)]
Removed uic3 autotest from qtbase
Prasanth Ullattil [Thu, 10 Mar 2011 15:23:01 +0000 (16:23 +0100)]
Load the sync.profile after setting the variables.
Marius Storm-Olsen [Wed, 2 Mar 2011 19:44:28 +0000 (13:44 -0600)]
Remove moved examples/demos
Marius Storm-Olsen [Fri, 25 Feb 2011 19:14:08 +0000 (19:14 +0000)]
Build examples and demos in qtbase
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
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.
Marius Storm-Olsen [Tue, 1 Feb 2011 20:38:28 +0000 (14:38 -0600)]
Properly detect qmodule.pri
Prasanth Ullattil [Tue, 8 Feb 2011 10:36:13 +0000 (11:36 +0100)]
Avoid recursively including the same arch.pri file
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.
axis [Thu, 27 Jan 2011 08:47:08 +0000 (09:47 +0100)]
Changed path references to ActiveQt.
Prasanth Ullattil [Wed, 26 Jan 2011 08:44:09 +0000 (09:44 +0100)]
Include headers.pri from the last path in MODULE_INCLUDES
Prasanth Ullattil [Tue, 25 Jan 2011 13:48:39 +0000 (14:48 +0100)]
Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for 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.
axis [Mon, 24 Jan 2011 14:52:04 +0000 (15:52 +0100)]
Fixed wrong inclusion of QtHelp module.
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.
Marius Storm-Olsen [Sat, 15 Jan 2011 04:25:12 +0000 (22:25 -0600)]
New configure.exe binary
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
Marius Storm-Olsen [Sat, 15 Jan 2011 03:35:58 +0000 (21:35 -0600)]
Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
axis [Fri, 14 Jan 2011 13:42:12 +0000 (14:42 +0100)]
Use correct DESTDIR for UiTools.
Liang Qi [Wed, 12 Jan 2011 20:06:11 +0000 (21:06 +0100)]
Move uitools from QtTools to QtBase
Olivier Goffart [Fri, 7 Jan 2011 15:49:50 +0000 (16:49 +0100)]
Demos: activate in profiles
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build
Olivier Goffart [Fri, 7 Jan 2011 12:46:25 +0000 (13:46 +0100)]
examples.pro removed moved subdirectories
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
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
axis [Mon, 3 Jan 2011 21:54:07 +0000 (22:54 +0100)]
Made the internal support for Qt3Support in QtGui compile.
axis [Mon, 3 Jan 2011 18:19:39 +0000 (19:19 +0100)]
Made syncqt collapse redundant ".." sections in paths.
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.
axis [Mon, 3 Jan 2011 18:12:55 +0000 (19:12 +0100)]
Corrected include path for UiTools.
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.
Each module now sets the QT_CONFIG variable itself.
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
Liang Qi [Mon, 27 Dec 2010 13:49:29 +0000 (14:49 +0100)]
Move QtSvg into a separate repository
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes 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
Liang Qi [Thu, 25 Nov 2010 12:39:10 +0000 (13:39 +0100)]
Remove the hardcode QT_CONFIG in those pri files.
Marius Storm-Olsen [Wed, 24 Nov 2010 19:21:56 +0000 (13:21 -0600)]
Make modules compile without hardcoded paths
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.
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.
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.
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.
Marius Storm-Olsen [Thu, 25 Nov 2010 01:51:35 +0000 (19:51 -0600)]
Fixup: not paths for other modules
axis [Tue, 16 Nov 2010 13:31:27 +0000 (14:31 +0100)]
Moved symbianpkgrules profiles to be feature profiles.
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.
Liang Qi [Mon, 15 Nov 2010 15:43:22 +0000 (16:43 +0100)]
Expose private support for separate module in syncqt.
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
Marius Storm-Olsen [Tue, 9 Nov 2010 02:09:10 +0000 (20:09 -0600)]
Some changes for qtbase
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
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.