summaryrefslogtreecommitdiffstats
path: root/demos/sqlbrowser
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-10 19:34:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 19:34:57 (GMT)
commite6e06e7ffc7a08368af79e1d2ed442e3c0df936c (patch)
tree731d8c8521a5f859a183fc9443fbf6c286b39389 /demos/sqlbrowser
parent497da277770ccf37e05a7b519afd5206601a7cf1 (diff)
parent9385f050620f14e3c3e4616906cf1999bf166041 (diff)
downloadQt-e6e06e7ffc7a08368af79e1d2ed442e3c0df936c.zip
Qt-e6e06e7ffc7a08368af79e1d2ed442e3c0df936c.tar.gz
Qt-e6e06e7ffc7a08368af79e1d2ed442e3c0df936c.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: (42 commits) Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else" Updated leading whitespace to make indentation more consistent Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms. make postgresql support sensitive to PSQL_LIBS support for cross building Qt for MinGW (win32-g++) on Unix use "win32-g++*" scope to match all MinGW makespecs Demos: Fix compilation with namespace. actually fix namespaced compile Attempt to fix build failure on Linux introduced by 09c6a81109 minor cosmetic improvements designer: add sorting in signal-slot editor window deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: change tabs to spaces I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h ...
Diffstat (limited to 'demos/sqlbrowser')
0 files changed, 0 insertions, 0 deletions