diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 11:45:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 11:45:39 (GMT) |
| commit | 8b533a7564c634e6e7228c5e02832d55513777b5 (patch) | |
| tree | b872a39d60fb130df00a1f6ded19140dec73c9c4 /src/3rdparty/libconninet/debian/libconninet0-dev.dirs | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| parent | 8c316faaeb6efdc82d3c17e03bd0e83da9783e6f (diff) | |
| download | Qt-8b533a7564c634e6e7228c5e02832d55513777b5.zip Qt-8b533a7564c634e6e7228c5e02832d55513777b5.tar.gz Qt-8b533a7564c634e6e7228c5e02832d55513777b5.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:
Doc: Added lisence header to snippet
Doc: Fixing QTBUG-13595
Fix compile warnings (unused variables).
Removing libconninet 3rdparty component.
Closes properly the dbus connection in icd backend
Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD.
Added my changes to the changelog.
Clarified documentation of loadFinished() signal.
Added a condition to skip obsolete functions during the threadness check.
Doc: call qApp->precessEvents after QSplashScreen::showMessage
Doc: Said that QApplication exits when not able to open X11 display
Doc: maintainance - fixing grammar and spelling
Doc: Added a note to qmake INSTALLS docs
Doc: Fixing overlapping text problem in columns
Doc: Added info on QWidget::render to printing docs
Added default value documentation for two variables.
Diffstat (limited to 'src/3rdparty/libconninet/debian/libconninet0-dev.dirs')
| -rw-r--r-- | src/3rdparty/libconninet/debian/libconninet0-dev.dirs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs b/src/3rdparty/libconninet/debian/libconninet0-dev.dirs deleted file mode 100644 index 4418816..0000000 --- a/src/3rdparty/libconninet/debian/libconninet0-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include |