diff options
| author | axis <qt-info@nokia.com> | 2011-01-28 12:29:47 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-01-28 12:29:52 (GMT) |
| commit | edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0 (patch) | |
| tree | 221c64f67aeee3addfe19760322e1bd8bb2d79cd /src | |
| parent | 5e3c4b6a82df640c15778af72384c6b27f8860b7 (diff) | |
| parent | 8a443d2695344f26b9adf4310672e1a5fd62aeb5 (diff) | |
| download | Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.zip Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.gz Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.bz2 | |
Merge branch 'windowsMakefileBuildSupport' into earth-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri | 6 | ||||
| -rw-r--r-- | src/src.pro | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/network/kernel/qnetworkinterface_symbian.cpp b/src/network/kernel/qnetworkinterface_symbian.cpp index 7942461..2879ceb 100644 --- a/src/network/kernel/qnetworkinterface_symbian.cpp +++ b/src/network/kernel/qnetworkinterface_symbian.cpp @@ -43,7 +43,7 @@ #include "qnetworkinterface.h" #include "qnetworkinterface_p.h" -#include "../corelib/kernel/qcore_symbian_p.h" +#include <private/qcore_symbian_p.h> #ifndef QT_NO_NETWORKINTERFACE diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri index ebeccc9..b7a87f3 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri @@ -34,6 +34,12 @@ silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso + # Workaround for the fact that make doesn't understand that sqlite3.dso + # is the same as $OBJECTS_DIR/sqlite3.dso + symbian_sqlite3_dso_standalone.target = sqlite3.dso + symbian_sqlite3_dso_standalone.depends = $$symbian_sqlite3_dso.output + QMAKE_EXTRA_TARGETS += symbian_sqlite3_dso_standalone + symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file symbian_sqlite3_ver_dso.output = sqlite3{00060003}.dso !isEmpty(OBJECTS_DIR):symbian_sqlite3_ver_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_ver_dso.output diff --git a/src/src.pro b/src/src.pro index c07d399..0bf3b52 100644 --- a/src/src.pro +++ b/src/src.pro @@ -109,7 +109,7 @@ src_webkit_declarative.target = sub-webkitdeclarative src_phonon.depends = src_gui src_multimedia.depends = src_gui contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl - src_tools_activeqt.depends = src_tools_idc src_gui + src_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_gui src_script src_network src_plugins.depends = src_gui src_sql src_svg contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia |