AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,407 Commits 4 Branches 0 Tags 339 MiB
7ebf21e004
Commit Graph

9392 Commits

Author SHA1 Message Date
Jørgen Lind
dc897ca7d9 Lazy init of QWindow 
(cherry picked from commit a2c884b6d2fcc77f6aa5e7aaa0aa329f5bef0bbd)
 2011-04-28 15:39:36 +02:00
Jørgen Lind
d04aee22e7 Added a visible state to QWindow 
(cherry picked from commit 6cd96d1921af9740bf92405ae3adf466140f8923)
 2011-04-28 15:39:33 +02:00
Jørgen Lind
2a8189035f Add isWindow type to QObject 
(cherry picked from commit 77f08730b4cdb23b43471b2b29ece59e159103d7)
 2011-04-28 15:39:30 +02:00
Jørgen Lind
d72a994a06 For QWindow we need topLevelExtra to be created when we have 
native widgets
(cherry picked from commit 247088f8fe929d55832f48af3da6f7e5e80cf8a4)
 2011-04-28 15:39:28 +02:00
Jørgen Lind
d8784df713 use QObject parent logic when setting parent for QWindow 
(cherry picked from commit 2be9fdb4b58accea4078654efed49a50acf6c74d)
 2011-04-28 15:39:25 +02:00
Jørgen Lind
54ab99d5e2 Fix compile warnings 
(cherry picked from commit e7e856403f32af3e75958c0a8ab68dc37d28df83)
 2011-04-28 15:39:23 +02:00
Jørgen Lind
4eb1543337 Lighthouse: use maybetopdata instead of creating topdata for all 
widgets
(cherry picked from commit 873764aa3cfbbd87bbbb4f3224a7807d46a16fc7)
 2011-04-28 15:39:20 +02:00
Samuel Rødal
45272d5e45 Get rid of QWindow::WindowType and clean up Qt::WindowFlags instead. 
(cherry picked from commit 72176bf2a490d2f831d53a66a0987213efa60935)
 2011-04-28 15:39:03 +02:00
Samuel Rødal
96b872506a Don't create a platform window if we already have one. 
(cherry picked from commit c4dea497adc36a0be840a51c9b98177f1f4b65b2)
 2011-04-28 15:39:00 +02:00
Jørgen Lind
02d44966ba Add proper parent logic for qwidget 
(cherry picked from commit 98118fb729c39083718c220383fff462ba8eaebd)
 2011-04-28 15:38:57 +02:00
Jørgen Lind
61c6f64872 Dont call QPlatformGLContext::makeCurrent from subclass 
(cherry picked from commit fc0a6ab220ab97b8f6acf90bf04b46de513a4d96)
 2011-04-28 15:38:54 +02:00
Samuel Rødal
ef77e8b651 Added QWindowContext and got wiggly up and running with xcb. 
(cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe)
 2011-04-28 15:38:51 +02:00
Jørgen Lind
fbef41167a Make QtGui compile again.... 
Comment out stuff in QWidget::create_sys
(cherry picked from commit 1bbc6a6bb2bf1175080e7a5ba6834ff642fd47ab)
 2011-04-28 15:38:48 +02:00
Samuel Rødal
25028e3b14 QPlatformWindowFormat -> QWindowFormat fixes. 
(cherry picked from commit 4c2eba33ca0433386fa1273fb1bc14adb852d9ac)
 2011-04-28 15:38:46 +02:00
Samuel Rødal
864a2dfa9b QWindow implementation fixes. 
(cherry picked from commit 2682cb6bd76a89c8d4ae81b0dd4a77abbf987c24)
 2011-04-28 15:38:43 +02:00
Samuel Rødal
dffc816f49 Make QWindowFormat in QWindow a setter and not a constructor argument. 
(cherry picked from commit 61e0c55dd0c82031cf5cd021bf3f3537ee91b4a8)
 2011-04-28 15:38:41 +02:00
Samuel Rødal
6d28965b10 Move WindowType to QWindow. 
(cherry picked from commit cfa7dc87bc962bd0f3a43a464723d74d87f997e2)
 2011-04-28 15:38:38 +02:00
Jørgen Lind
498f938f2d Just some more on QWindow. Nothing works 
(cherry picked from commit 3acf7aa979630a57791e2a039b1b7b0b85b0aac8)
 2011-04-28 15:38:35 +02:00
Samuel Rødal
fee009bcf9 WIP Qt 5 API. 
(cherry picked from commit ad12d5babcdc2bad3f2c0fb9fd352ab79c197aa1)
 2011-04-28 15:36:28 +02:00
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
Prasanth Ullattil
055a45e61d Fix the target for QtUiTools debug on Mac 2011-04-27 12:06:04 +02:00
axis
2e1af58417 Introduced the QT.<module>.plugins variable to module profiles. 2011-04-27 12:06:02 +02:00
axis
afa1807c40 Added QT.<module>.imports support to module profiles. 2011-04-27 12:06:00 +02:00
Prasanth Ullattil
d7ce3d25bc Avoid recursively including the same arch.pri file 2011-04-27 12:05:57 +02:00
Prasanth Ullattil
3bfa70fef9 Include headers.pri from the last path in MODULE_INCLUDES 2011-04-27 12:05:55 +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
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
axis
12207a855f Made the internal support for Qt3Support in QtGui compile. 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
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
f6d0b71700 Some changes for qtbase 2011-04-27 12:05:44 +02:00
Qt by Nokia
38be0d1383 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
 2011-04-27 12:05:43 +02:00