summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 06:33:50 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 06:33:50 (GMT)
commit04b8d70bb0965f868ffa78595c7afc99675e656e (patch)
tree07a8996dd59ae44257ac221c22b6a72b2224ddf2 /qmake
parent872f4b5a5bc913fa77993b92f1ef693bb5718b18 (diff)
downloadQt-04b8d70bb0965f868ffa78595c7afc99675e656e.zip
Qt-04b8d70bb0965f868ffa78595c7afc99675e656e.tar.gz
Qt-04b8d70bb0965f868ffa78595c7afc99675e656e.tar.bz2
Fixes to qmake for Linux build
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.unix2
-rw-r--r--qmake/generators/symbian/symmake.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 6aa4f2b..c7f4dc4 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -46,7 +46,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge
generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \
generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \
- generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp
+ generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \
$(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \
$(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
$(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \
diff --git a/qmake/generators/symbian/symmake.h b/qmake/generators/symbian/symmake.h
index 5172687..ed24d20 100644
--- a/qmake/generators/symbian/symmake.h
+++ b/qmake/generators/symbian/symmake.h
@@ -116,7 +116,7 @@ protected:
public:
SymbianMakefileGenerator();
- inline ~SymbianMakefileGenerator();
+ ~SymbianMakefileGenerator();
};