Eskil Abrahamsen Blomfeldt
07fa0ccfc4
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
2011-04-28 11:01:04 +02:00
axis
9e57cd5e6a
Merged master into qtquick2.
2011-04-27 14:34:19 +02:00
Qt by Nokia
eae8fb8599
Initial import from qtquick2.
...
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 14:33:44 +02:00
axis
0c637cb07b
Added dependency information to the sync.profile.
2011-04-27 12:34:11 +02:00
axis
106c57c238
Add .gitignore to each module
2011-04-27 12:06:07 +02:00
Prasanth Ullattil
055a45e61d
Fix the target for QtUiTools debug on Mac
2011-04-27 12:06:04 +02:00
Marius Storm-Olsen
0389278105
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.
2011-04-27 12:06:04 +02:00
Marius Storm-Olsen
57e47f1c7e
Remove not needed .pri include
2011-04-27 12:06:04 +02:00
Liang Qi
d5622b287e
Add tst_headersclean for each module
2011-04-27 12:06:03 +02:00
Liang Qi
cc47cce747
Modularized tst_compilerwarnings
2011-04-27 12:06:03 +02:00
Liang Qi
6a1d5f8723
Modularized tst_bic and add some helper functions for global test
2011-04-27 12:06:03 +02:00
axis
2e1af58417
Introduced the QT.<module>.plugins variable to module profiles.
2011-04-27 12:06:02 +02:00
axis
0cdec327f2
Fixed maketestselftest after guiapplauncher was made a global test.
2011-04-27 12:06:02 +02:00
axis
74511a84ee
Removed examples and demos that are no longer in qtbase.
2011-04-27 12:06:02 +02:00
axis
cdf6ce6adb
Removed reference to linguist test, which is now in qttools.
2011-04-27 12:06:01 +02:00
axis
b5989f6867
Adapted guiapplauncher test to modularized Qt.
...
Now it reads the test cases from text files in each repository
instead.
2011-04-27 12:06:01 +02:00
axis
30be61219d
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.
2011-04-27 12:06:01 +02:00
Prasanth Ullattil
574e7e44d3
q3tl.h is copied to qalgorithms autotest directory
2011-04-27 12:06:01 +02:00
axis
bd025379c8
Fixed "make check" target for qtbase.
...
It was caused by a missing "tests" target.
2011-04-27 12:06:00 +02:00
axis
afa1807c40
Added QT.<module>.imports support to module profiles.
2011-04-27 12:06:00 +02:00
Prasanth Ullattil
a3feb69d4c
Removed uic3 autotest from qtbase
2011-04-27 12:06:00 +02:00
Prasanth Ullattil
d6805e71ff
Load the sync.profile after setting the variables.
2011-04-27 12:06:00 +02:00
Marius Storm-Olsen
ac1fee88d2
Remove moved examples/demos
2011-04-27 12:05:59 +02:00
Marius Storm-Olsen
d383f9f8bc
Build examples and demos in qtbase
2011-04-27 12:05:59 +02:00
Marius Storm-Olsen
bd06459179
Make qmake respect <subdir>.CONFIG = no_default_install
...
It already respects no_default_target
2011-04-27 12:05:58 +02:00
Prasanth Ullattil
88dd54405f
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.
2011-04-27 12:05:58 +02:00
Marius Storm-Olsen
2a5e47832b
Properly detect qmodule.pri
2011-04-27 12:05:58 +02:00
Prasanth Ullattil
d7ce3d25bc
Avoid recursively including the same arch.pri file
2011-04-27 12:05:57 +02:00
axis
8e4fc361a5
Made sure syncqt gets called correctly even if it is not in the PATH.
2011-04-27 12:05:57 +02:00
axis
59db0a203d
Changed path references to ActiveQt.
2011-04-27 12:05:56 +02:00
Prasanth Ullattil
3bfa70fef9
Include headers.pri from the last path in MODULE_INCLUDES
2011-04-27 12:05:55 +02:00
Prasanth Ullattil
b88c6fbcfe
Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
2011-04-27 12:05:55 +02:00
Prasanth Ullattil
61126f4ae6
Use the 'install_name' linker flag on Mac for the frameworks.
...
This is required for the frameworks outside the qtbase module.
2011-04-27 12:05:55 +02:00
axis
346b3b0976
Fixed wrong inclusion of QtHelp module.
2011-04-27 12:05:54 +02:00
axis
a93039b229
Fixed a bug in libdir handling.
...
We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because
MSVC does not understand -L.
2011-04-27 12:05:54 +02:00
Marius Storm-Olsen
0f7380b2e7
New configure.exe binary
2011-04-27 12:05:53 +02:00
Marius Storm-Olsen
c681019093
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
2011-04-27 12:05:53 +02:00
Marius Storm-Olsen
56ec511c6a
Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
2011-04-27 12:05:53 +02:00
axis
95137041ab
Use correct DESTDIR for UiTools.
2011-04-27 12:05:52 +02:00
Liang Qi
80473d3c2c
Move uitools from QtTools to QtBase
2011-04-27 12:05:52 +02:00
Olivier Goffart
a3d79d1d3c
Demos: activate in profiles
2011-04-27 12:05:52 +02:00
Liang Qi
7463141773
Make auto test build
2011-04-27 12:05:51 +02:00
Olivier Goffart
8c845c7122
examples.pro removed moved subdirectories
2011-04-27 12:05:51 +02:00
Marius Storm-Olsen
82bf3bd775
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
2011-04-27 12:05:51 +02:00
Marius Storm-Olsen
3ec5d96657
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
2011-04-27 12:05:51 +02:00
axis
12207a855f
Made the internal support for Qt3Support in QtGui compile.
2011-04-27 12:05:50 +02:00
axis
c7e91df28e
Made syncqt collapse redundant ".." sections in paths.
2011-04-27 12:05:50 +02:00
axis
95be70778a
Fixed useless substitution in syncqt.
...
The substitution is not necessary and messes up the argument that is
passed in.
2011-04-27 12:05:50 +02:00
axis
fb9b30b610
Corrected include path for UiTools.
2011-04-27 12:05:50 +02:00
axis
6036305fb0
Extended module profiles.
...
Each module now sets the QT_CONFIG variable itself.
2011-04-27 12:05:50 +02:00
