diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 23:11:37 (GMT) | 
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 23:11:37 (GMT) | 
| commit | 0da9aa430240cefc7486efb3a68421423bc4fb76 (patch) | |
| tree | e09cae283a652c5b926a059570f9f403356528af /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | 3e6a12e90d05d24bca68128d60215c207a416ef6 (diff) | |
| parent | c693b4f8f38c435beffe1deb6186912123cd05f9 (diff) | |
| download | Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.zip Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.gz Qt-0da9aa430240cefc7486efb3a68421423bc4fb76.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
  bye bye QMakeProjectEnv
  short-cut evaluation inside if() tests
  eliminate special splitting of INCLUDEPATH and DEPENDPATH
  do not env-expand cache file path
  s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
  s/INCPATH/INCLUDEPATH/
  s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
  teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
  warn about usage of deprecated variables
  warn about using non-lowercased replace $$function()s
  add -Wdeprecated option (on by default)
  make QMakeProject::isEmpty() consider legacy mappings
  document some functions' scope
  fix $$size() not using function-scoped variables
  doc: Fixed some qdoc errors.
  qdoc: Added breadcrumbs for namespaces.
  Autotest: check that we receive key events on toplevel widgets
  Cocoa: key events stopped working
  Update Polish translations
  qdoc: Added "All namespaces" to the API Lookup box.
  ...
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions
