| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
It does not make sense to register the server examples on the CI
since the registration step is slow and bound to fail if for example
the QPA plugin fails to load in headless environments.
Detect the CI environment by checking on the environment variable
JENKINS_HOME and turn off the axserver post link step accordingly.
Change-Id: I59e8170f071504ee2b141b8a38b594d5bac734c6
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
| |
expand tabs, fix indentation, remove trailing whitespace.
Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
qt is already added by spec_pre.prf.
Change-Id: Id53efb418c1d545c4c90280f54b3824ae8261e49
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
follow respective change in qtbase
Change-Id: I6bbcefcad264191dac51d52cd335de776ae3bfe5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The formerly monolithic ActiveQt module has been split into three
modules:
axserver
A static library for creating a server project.
axcontainer
A static libary for creating a container project.
axbase
A static library with shared code for the latter two libraries.
This module also is responsible for the installation of header
files in the include/ActiveQt directory.
"CONFIG += qaxserver" has been deprecated.
Use "QT += axserver" instead.
"CONFIG += qaxcontainer" has been deprecated.
Use "QT += axcontainer" instead.
Code from qaxtypes.cpp that does not depend on the QAX_SERVER define
has been moved to qaxtypefunctions.cpp and resides in the axbase
module.
Task-number: QTBUG-27776
Change-Id: Ib39fc897ccfce16849be0e3c084817d2cd0fc926
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
These defines are old compatiblity defines and are no longer
supposed to be used.
Usage in examples doesn't do anything currently, so removed
it entirely.
Task-number: QTBUG-28181
Change-Id: I98db88e3ef9f98c70132cea986127ed883dd8503
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Active Qt examples cannot have dependencies to sources because not
all installations have sources available. Each example that needs them
now has its own copy of .rc, .def, and .ico files to make them
self-contained.
Task-number: QTBUG-26848
Change-Id: I1ce919dd393ff372ef12c5db268f9f08022fa3f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Comment out Some functionality for the moment.
Change-Id: Ia7d1d3ba982e97776ae7259be06689b5477450a1
Reviewed-on: http://codereview.qt-project.org/5972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
| |
|
|
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
|