diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 19:50:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-10 19:50:08 (GMT) |
| commit | 31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f (patch) | |
| tree | 957b84d8f1792f9e5a43c879274469c4f07168ea /mkspecs/features/unix | |
| parent | e0ef11578048620b3f107b7a357fed3aade0d21e (diff) | |
| parent | b3981fd1f7b82742857c613af6dfbe41b5493577 (diff) | |
| download | Qt-31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f.zip Qt-31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f.tar.gz Qt-31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (284 commits)
Fixed crash in input methods when using symbols menu and numbers only
Fixed crash in input methods when using symbols menu and numbers only
Read the data when the stream passed in is of type CArchiveStream
Autotest for QTBUG-13454.
Changing the Image 'source' should not go through the 'Loading' state if the image is cached.
Make sure we blit to the correct FBO in the GL window surface.
Some optimizations to the GL pixmap data.
QList::toVector()/QVector::toStdVector()/QVector::fromStdVector(): use reserve()
When a move is completed, report the source and destination correctly.
Fixed the scrolling of text in QLineEdit with right alignment
Editable QComboBox popup immediately closes itself after a click
Change RLibrary handle in QS60PluginResolver to be process wide
Cursor is misplaced in the editors text area
Update running animations if a SmoothedAnimation is changed
Removing Q_ENUMS declaration in QTransform
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
Fix SmoothedAnimation test and docs
Fix qdeclarativeimageprovider autotest compilation on Symbian
Fix reversingModes of QDeclarativeSmoothedAnimation
Re-add quit button to declarative Twitter demo
...
Diffstat (limited to 'mkspecs/features/unix')
| -rw-r--r-- | mkspecs/features/unix/separate_debug_info.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf index 40d52cb..8843c6d 100644 --- a/mkspecs/features/unix/separate_debug_info.prf +++ b/mkspecs/features/unix/separate_debug_info.prf @@ -1,8 +1,9 @@ !separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { - QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ; + QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/ + !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK QMAKE_POST_LINK = $$QMAKE_SEPARATE_DEBUG_INFO $$QMAKE_POST_LINK silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK |