diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 05:42:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-19 05:42:14 (GMT) |
| commit | ed604d1a6420c1e6598b7d509dd108aa20db4509 (patch) | |
| tree | 41b2a590ba25cee8c88fd5b69ad53f8169d24f47 /qmake/generators/symbian/initprojectdeploy_symbian.h | |
| parent | 0f01ad8c73e352a8368296820f4dd77f9da06114 (diff) | |
| parent | e3db2e423f38c254331674360e4dded1d7fc1d60 (diff) | |
| download | Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.zip Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.tar.gz Qt-ed604d1a6420c1e6598b7d509dd108aa20db4509.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Pass QAudioDeviceInfo when creating audio input/output in examples
Symbian backend for QtMultimedia audio
Modified configure to detect SDK support for Symbian audio backend
Added implementation of epocRoot() function to configure
Removed duplicated implementation of readRegistryKeys from configure
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
QWebView scrolling doesn't clear old elements before painting again
Diffstat (limited to 'qmake/generators/symbian/initprojectdeploy_symbian.h')
| -rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.h b/qmake/generators/symbian/initprojectdeploy_symbian.h index e23e6a9..b409225 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.h +++ b/qmake/generators/symbian/initprojectdeploy_symbian.h @@ -50,8 +50,6 @@ #include <qfile.h> #include <stdlib.h> -#include "epocroot.h" - #define PLUGIN_STUB_DIR "qmakepluginstubs" struct CopyItem |