Commits

dirkbaechle committed 92a4ddc

- some minor fixes

Comments (0)

Files changed (2)

         'QtGui',
         'QtMultimedia',
         'QtMultimediaQuick_p',
-        'QtMultimediaWidgets'
+        'QtMultimediaWidgets',
         'QtNetwork',
+        'QtPlatformSupport',
         'QtQml',
+        'QtQmlDevTools',
         'QtQuick',
         'QtQuickParticles',
         'QtSql',
         'QtScript',
         'QtScriptTools',
         'QtSvg',
+        'QtUiTools',
         'QtXml',
         'QtXmlPatterns',
         # Qt Tools

test/qt_examples/create_scons_tests.py

                   'multimedia' : ['QtCore','QtGui','QtMultimedia'],
                   'script' : ['QtCore','QtGui','QtScript'],
                   'help' : ['QtCore','QtGui','QtXml','QtSql','QtNetwork','QtHelp'],
-                  'qaxserver' : ['QtCore','QtGui','QAxFactory'],
-                  'qaxcontainer' : ['QtCore','QtGui','QAxFactory'],
                   'qtestlib' : ['QtCore','QtGui','QtTest'],
-                  'qt3support' : ['QtCore','QtGui','Qt3Support'],
-                  'opengl' : ['QtCore','QtGui','QtOpenGL']
+                  'opengl' : ['QtCore','QtGui','QtOpenGL'],
+                  'widgets' : ['QtCore','QtGui','QtWidgets']
                   }
 # for the following CONFIG values we have to provide additional CPP defines
 config_defines = {'plugin' : ['QT_PLUGIN'],
     'QtGui',
     'QtMultimedia',
     'QtMultimediaQuick_p',
-    'QtMultimediaWidgets'
+    'QtMultimediaWidgets',
     'QtNetwork',
+    'QtPlatformSupport',
     'QtQml',
+    'QtQmlDevTools',
     'QtQuick',
     'QtQuickParticles',
     'QtSql',
     'QtQuickTest',
     'QtTest',
     'QtWebKit',
-    'QtWebKitWidgets'
+    'QtWebKitWidgets',
     'QtWidgets',
     # Qt Add-Ons
     'QtConcurrent',
     'QtScript',
     'QtScriptTools',
     'QtSvg',
+    'QtUiTools',
     'QtXml',
     'QtXmlPatterns',
     # Qt Tools
 
 def detectLatestQtVersion():
     if sys.platform.startswith("linux"):
-        # Inspect '/usr/local/Trolltech' first...
+        # Inspect '/usr/local/Qt' first...
+        paths = glob.glob('/usr/local/Qt-*')
+        if len(paths):
+            paths.sort()
+            return extendQtPath(paths[-1])
+        # Inspect '/usr/local/Trolltech'...
         paths = glob.glob('/usr/local/Trolltech/*')
         if len(paths):
             paths.sort()
 
 def detectPkgconfigPath(qtdir):
     pkgpath = os.path.join(qtdir, 'lib', 'pkgconfig')
-    if os.path.exists(os.path.join(pkgpath,'QtCore.pc')):
+    if os.path.exists(os.path.join(pkgpath,'Qt5Core.pc')):
         return pkgpath
     pkgpath = os.path.join(qtdir, 'lib')
-    if os.path.exists(os.path.join(pkgpath,'QtCore.pc')):
+    if os.path.exists(os.path.join(pkgpath,'Qt5Core.pc')):
         return pkgpath
 
     return ""
     
     for m in inc_re.finditer(content):
         mod = m.group(1)
-        if (mod in valid_qt_modules) and (mod not in mods):
+        if (mod in validModules) and (mod not in mods):
             mods.append(mod)
     return mods
 
 
         options['qtpath'] = qtpath
         options['qtmodules'] = []
-        for v in valid_qt_modules:
-            if os.path.exists(os.path.join(options['pkgconfig'],v+'.pc')):
+        for v in validModules:
+            if os.path.exists(os.path.join(options['pkgconfig'],v.replace('Qt','Qt5')+'.pc')):
                 options['qtmodules'].append(v)
 
     if not clean: