~ubuntu-branches/ubuntu/maverick/qt4-x11/maverick-security

« back to all changes in this revision

Viewing changes to src/corelib/global/qfeatures.h

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-06 02:43:04 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20100706024304-xnrnlzeq0r5nggnb
Tags: 4:4.7.0~beta1+git20100706-0ubuntu1
* New upstream snapshot
  - Refresh kubuntu patches
  - libqt4-help replaces qt4-dev-tools (<< 4:4.7.0~beta1+git20100706)
  - qt4-designer replaces qt4-dev-tools (<< 4:4.7.0~beta1+git20100706)
  - Disable kubuntu_08_add_missing_bold_style.diff
  - Disable kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
  - New packages:
    - qt4-qmlviewer, which replaces qt4-dev-tools
    - libqt4-declarative-{particles, gestures, folderlistmodel} which
      replaces libqt4-declarative (<< 4:4.7.0~beta1+git20100706)
* Merge with Debian git (unreleased) remaining changes:
  - Do not package firebird and ibase packages, remove from debian/rules and
    debian/control
  - libqt4-sql-ibase not recommend for libqt4-sql
  - libqtgui4: suggest, not recommend, qt4-qtconfig
  - Build with -no-phonon
  - Do not package libqt4-phonon
  - Do not add libpulse-dev to build-depends
  - Do not package libqt4-webkit transitional package
  - Build with -multimedia for now
    - Keep libqt4-multimedia package in debian/control
    - Keep libqt4-multimedia.{install, symbols, lintian-overrides}
  - libqt4-dev recommends libqt4-webkit
  - Build packages with lzma compression with override_dh_builddeb
  - Rules to remove po dir in clean
  - Add MessagesQt.sh
  - Rules to create Messages.sh link to MessagesQt.sh and rules to create po
    dir and exectue extract-messages.sh in common-install-prehook-impl
  - Rules to remove Messages.sh link
  - Make libqt4-dev depend on libx11-dev
  - In debian/rules Set DEB_HOST_ARCH and
    DEB_HOST_ARCH_OS. Configure with "-arch armv6" option on ARM
  - Add Kubuntu patches:
    - kubuntu_08_add_missing_bold_style.diff
    - kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
    - kubuntu_10_ibus_input_method.diff
    - kubuntu_12_fix_stack_protector.diff
    - kubuntu_14_qtdemos_compile_failure.diff
    - kubuntu_15_appmenu.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
// Freetype Font Engine
86
86
//#define QT_NO_FREETYPE
87
87
 
 
88
// Gesture
 
89
//#define QT_NO_GESTURES
 
90
 
88
91
// QGroupBox
89
92
//#define QT_NO_GROUPBOX
90
93
 
335
338
#define QT_NO_DATESTRING
336
339
#endif
337
340
 
338
 
// QtDBus module
339
 
#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES))
340
 
#define QT_NO_DBUS
341
 
#endif
342
 
 
343
341
// QDial
344
342
#if !defined(QT_NO_DIAL) && (defined(QT_NO_SLIDER))
345
343
#define QT_NO_DIAL
515
513
#define QT_NO_CONTEXTMENU
516
514
#endif
517
515
 
 
516
// QtDBus module
 
517
#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_DOM))
 
518
#define QT_NO_DBUS
 
519
#endif
 
520
 
518
521
// File Transfer Protocol
519
522
#if !defined(QT_NO_FTP) && (defined(QT_NO_URLINFO) || defined(QT_NO_TEXTDATE))
520
523
#define QT_NO_FTP