Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
Qtactiveqt
Commits
7d744485
Commit
7d744485
authored
12 years ago
by
Sergio Ahumada
Browse files
Options
Download
Plain Diff
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: Id15d554ef88f18638f2662abb6611faaa1a72e05
parents
4929a38d
935fd0d0
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
old/5.1
old/5.2
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
No related merge requests found
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
src/activeqt/container/container.pro
+2
-0
src/activeqt/container/container.pro
src/activeqt/container/filterwidget.cpp
+321
-0
src/activeqt/container/filterwidget.cpp
src/activeqt/container/filterwidget_p.h
+151
-0
src/activeqt/container/filterwidget_p.h
src/activeqt/container/qaxbase.cpp
+1
-1
src/activeqt/container/qaxbase.cpp
src/activeqt/container/qaxbase.h
+0
-4
src/activeqt/container/qaxbase.h
src/activeqt/container/qaxobject.h
+0
-4
src/activeqt/container/qaxobject.h
src/activeqt/container/qaxscript.h
+0
-4
src/activeqt/container/qaxscript.h
src/activeqt/container/qaxselect.cpp
+58
-16
src/activeqt/container/qaxselect.cpp
src/activeqt/container/qaxselect.h
+7
-10
src/activeqt/container/qaxselect.h
src/activeqt/container/qaxselect.ui
+72
-129
src/activeqt/container/qaxselect.ui
src/activeqt/container/qaxwidget.h
+0
-4
src/activeqt/container/qaxwidget.h
src/activeqt/control/qaxaggregated.h
+0
-4
src/activeqt/control/qaxaggregated.h
src/activeqt/control/qaxbindable.h
+0
-4
src/activeqt/control/qaxbindable.h
src/activeqt/control/qaxfactory.h
+0
-4
src/activeqt/control/qaxfactory.h
src/activeqt/control/qaxserverbase.cpp
+8
-73
src/activeqt/control/qaxserverbase.cpp
src/activeqt/control/qaxservermain.cpp
+15
-13
src/activeqt/control/qaxservermain.cpp
src/activeqt/shared/qaxtypefunctions.h
+0
-4
src/activeqt/shared/qaxtypefunctions.h
src/activeqt/shared/qaxtypes.cpp
+2
-2
src/activeqt/shared/qaxtypes.cpp
src/activeqt/shared/qaxtypes.h
+0
-4
src/activeqt/shared/qaxtypes.h
tools/dumpcpp/main.cpp
+4
-1
tools/dumpcpp/main.cpp
with
641 additions
and
281 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets