qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
65,539 Commits 68 Branches 266 Tags 805 MiB
Commit Graph

65539 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
Gunnar Sletta 7e4abe3a5f Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into qtquick2 2011-04-28 15:08:33 +02:00
Gunnar Sletta 514641bed5 QT += declarative implies += opengl too, so hardcode it to make stuff work 2011-04-28 15:07:51 +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
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