AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,652 Commits 4 Branches 0 Tags 339 MiB
54d8d8055e
Commit Graph

61652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marius Storm-Olsen
4b3498e940 Add hardcoded qclass_lib_map.h based on 4.8 
This is only until UIC/Designer handles this properly
 2011-04-27 12:05:49 +02:00
Liang Qi
817232ee94 Move QtSvg into a separate repository 2011-04-27 12:05:49 +02:00
Liang Qi
6d8ffc2cbb Add the private_includes path to the modules .pri file 2011-04-27 12:05:48 +02:00
Marius Storm-Olsen
997f87bfcf Add the source path to the modules .pri file 2011-04-27 12:05:48 +02:00
Liang Qi
8f9b949c64 Remove the hardcode QT_CONFIG in those pri files. 2011-04-27 12:05:47 +02:00
Marius Storm-Olsen
68d7b61d48 Make modules compile without hardcoded paths 2011-04-27 12:05:47 +02:00
Marius Storm-Olsen
78797cc7e9 Make qt.prf use new qt_module.pri structure for QT variable 
This change requires the new resolve_depends(var, prefix) function in qmake.
 2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
bca5a5d6f6 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.
 2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
00c5f39081 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.
 2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
94e8d3b686 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.
 2011-04-27 12:05:46 +02:00
Marius Storm-Olsen
81f7b862d6 Fixup: not paths for other modules 2011-04-27 12:05:46 +02:00
axis
32c4a26218 Moved symbianpkgrules profiles to be feature profiles. 2011-04-27 12:05:45 +02:00
Marius Storm-Olsen
07bed9a211 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.
 2011-04-27 12:05:45 +02:00
Liang Qi
703842d450 Expose private support for separate module in syncqt. 2011-04-27 12:05:45 +02:00
Marius Storm-Olsen
a6fa179a23 Expose source and build directories for QtBase 
Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
 2011-04-27 12:05:45 +02:00
Marius Storm-Olsen
f6d0b71700 Some changes for qtbase 2011-04-27 12:05:44 +02:00