diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 11:56:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 11:56:16 (GMT) |
| commit | b3f22c1e9568e0e9b6c2898a879032f725587351 (patch) | |
| tree | 7c6de455791d94b4047edbce4484711fd5d9d6d4 /qmake | |
| parent | 3d247e0ae09bcd1b75f92a587ab5b28569a3f0f6 (diff) | |
| parent | 1af67c36b6064dfb4ec51217993c6a99ead493c9 (diff) | |
| download | Qt-b3f22c1e9568e0e9b6c2898a879032f725587351.zip Qt-b3f22c1e9568e0e9b6c2898a879032f725587351.tar.gz Qt-b3f22c1e9568e0e9b6c2898a879032f725587351.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix compilation on Windows CE
Add missing license header
Fixed input context trying to squeeze content into a full widget.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Some small Solaris fixes.
Fix QtScript Date <--> QDateTime (local time) conversion
Fix Qt applications freezing until mouse/keyboard events occur.
Recognize GL_ARB_shader_objects as indicating shaders
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 5 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++ | 4 | ||||
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 4 | ||||
| -rw-r--r-- | qmake/qmake.pri | 3 |
4 files changed, 15 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 354a73f..4d0121c 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -84,6 +84,7 @@ QTOBJS= \ qtemporaryfile.obj \ qabstractfileengine.obj \ qfsfileengine_win.obj \ + qsystemlibrary.obj \ qfsfileengine_iterator_win.obj \ qfileinfo.obj \ qglobal.obj \ @@ -125,6 +126,7 @@ clean:: -del $(OBJS) -del qmake_pch.obj -del qmake_pch.pch + -del qsystemlibrary.obj -del vc60.pdb -del vc70.pdb -del qmake.pdb @@ -148,6 +150,9 @@ distclean:: clean $(OBJS): qmake_pch.obj +qsystemlibrary.obj: $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\plugin\qsystemlibrary.cpp + $(QTOBJS): qmake_pch.obj qmake_pch.obj: diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index e52b8c6..f313f9e 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -79,6 +79,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ @@ -234,6 +235,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index e4e2e6a..af54288 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -79,6 +79,7 @@ QTOBJS= \ qutfcodec.o \ qstring.o \ qstringlist.o \ + qsystemlibrary.o \ qtextstream.o \ quuid.o \ qvector.o \ @@ -233,6 +234,9 @@ qdatetime.o: $(SOURCE_PATH)/src/corelib/tools/qdatetime.cpp qstringlist.o: $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstringlist.cpp +qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp + qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qmap.cpp diff --git a/qmake/qmake.pri b/qmake/qmake.pri index a7e0ab1..36c5d36 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -132,7 +132,8 @@ bootstrap { #Qt code LIBS += -framework ApplicationServices } } else:win32 { - SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp + SOURCES += qfsfileengine_win.cpp qfsfileengine_iterator_win.cpp qsettings_win.cpp \ + qsystemlibrary.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib win32-g++*:LIBS += -lole32 -luuid } |