~ubuntu-branches/ubuntu/oneiric/pyside/oneiric

« back to all changes in this revision

Viewing changes to PySide/global.h.in

  • Committer: Bazaar Package Importer
  • Author(s): Didier Raboud
  • Date: 2010-10-19 22:52:14 UTC
  • mfrom: (1.2.2 upstream) (6.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101019225214-39nuv0l2v7ftju5p
Tags: 0.4.2-1
* New 0.4.2 upstream release.
  - Add some 0.4.1 and 0.4.2 symbols.
  - Bump apiextractor and shiboken B-D versions.
  - Update patches.
  - Update debian/dh_pycmakedeps to work with new upstream coding style.

* Patches:
  - u_c130273_fix_py25_QtScript_property.patch
    Remove, was from upstream.
  - u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
    Remove, was from upstream.
  - u_268bf77_fixed_signal_signature_parser.patch
    Remove, was from upstream.
  + libPythonVersionPostfix.patch: Refresh
  + usePySpecificShiboken.patch: Refresh
  + lessBuildVerbosity.patch: Refresh
 
* Bump the B-D chain versions.
* Make sure the private.py is installed in QtCore module.
* Build against Qt 4.7.
  - Add libqtwebkit-dev
  - Drop QtMultimedia module.
  - Add the QtDeclarative package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
337
337
#include "qpytextobject.h"
338
338
#if @ENABLE_X11@
339
339
  #include <QtGui/QX11Info>
 
340
  #include <QtGui/QX11EmbedContainer>
 
341
  #include <QtGui/QX11EmbedWidget>
340
342
#endif
341
343
#include <QtXml/QtXml>
342
344
#include <QtUiTools/QtUiTools>