diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 15:54:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 15:54:51 (GMT) |
| commit | 3671dbf34940e166b747b6f8f3f5758fd486073c (patch) | |
| tree | 73dfe3d7d5150f4f6cbeac8ead747eedfd323123 /mkspecs | |
| parent | 194013d9db1b3e4ba6f56a864f3b64f523202948 (diff) | |
| parent | 3343298448da3f2546b0708670effb798f762c5c (diff) | |
| download | Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.zip Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.tar.gz Qt-3671dbf34940e166b747b6f8f3f5758fd486073c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (153 commits)
Use QTRY_COMPARE after QTest::qWaitForWindowShown()
Use the new memory cost reporting API in QtScript Custom Class example
QtScript: Add API for reporting additional memory costs
Add experimental support for StaticContents in Mac OS X.
Fix misspelling in function name.
don't just return the first key here.
Fix CI sytem build breakage.
Fix crash.
Compile with QT_NO_NETWORKINTERFACE defined.
Don't emit signals in constructor.
Remove unused code.
fix multiple promps for keychain access when connecting to wifi network
not all interfaces should be active
Update changelog
Fix qcombobox:flaggedItems autotest failure.
Wrong value for PM_ScrollBarExtent on Windows XP.
doc: Fixed all the remaining qdoc errors. For now.
Do not move keyboard focus to invisible windows on X11.
Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.
Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 7 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 090f3b6..2f92ea2 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -9,9 +9,6 @@ QMAKE_INCREMENTAL_STYLE = sublib DEFINES += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED QT_USE_MATH_H_FLOATS -# QNetworkAccessManager to create a network session by default -DEFINES += QT_QNAM_DEFAULT_NETWORK_SESSION - QMAKE_COMPILER_DEFINES += SYMBIAN QMAKE_EXT_OBJ = .o @@ -66,8 +63,8 @@ QMAKE_LINK_OBJECT_MAX = QMAKE_LINK_OBJECT_SCRIPT= QMAKE_LIBS = -llibc -llibm -leuser -llibdl -QMAKE_LIBS_CORE = $$QMAKE_LIBS -lefsrv -QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lhal -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository +QMAKE_LIBS_CORE = $$QMAKE_LIBS -lefsrv -lhal +QMAKE_LIBS_GUI = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -leikcoctl -leiksrv -lapparc -lcentralrepository QMAKE_LIBS_NETWORK = QMAKE_LIBS_EGL = -llibEGL QMAKE_LIBS_OPENGL = diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index e272e72..ca201bc 100644 --- a/mkspecs/linux-g++-maemo/qmake.conf +++ b/mkspecs/linux-g++-maemo/qmake.conf @@ -33,7 +33,4 @@ DEFINES += QT_GL_NO_SCISSOR_TEST # Work round SGX 1.4 driver bug (text corrupted), modify glyph cache width: DEFINES += QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -# QNetworkAccessManager to create a network session by default -DEFINES += QT_QNAM_DEFAULT_NETWORK_SESSION - load(qt_config) |